langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
author sadayapalam
Thu, 28 Jan 2016 09:09:34 +0530
changeset 35418 8681d57fc3f8
parent 34752 9c262a013456
child 39587 76c453568ffa
permissions -rw-r--r--
8144168: No type annotations generated for nested lambdas Reviewed-by: jlahoda
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     1
/*
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
     2
 * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     4
 *
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    10
 *
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    15
 * accompanied this code).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    16
 *
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    20
 *
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    23
 * questions.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    24
 */
34752
9c262a013456 8145342: Some copyright notices are inconsistently and ill formatted
vasya
parents: 34568
diff changeset
    25
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    26
package com.sun.tools.javac.comp;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    27
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    28
import com.sun.tools.javac.tree.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    29
import com.sun.tools.javac.tree.JCTree.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    30
import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    31
import com.sun.tools.javac.tree.TreeMaker;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    32
import com.sun.tools.javac.tree.TreeTranslator;
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
    33
import com.sun.tools.javac.code.Attribute;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25281
diff changeset
    34
import com.sun.tools.javac.code.Scope.WriteableScope;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    35
import com.sun.tools.javac.code.Symbol;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    36
import com.sun.tools.javac.code.Symbol.ClassSymbol;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    37
import com.sun.tools.javac.code.Symbol.DynamicMethodSymbol;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    38
import com.sun.tools.javac.code.Symbol.MethodSymbol;
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
    39
import com.sun.tools.javac.code.Symbol.TypeSymbol;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    40
import com.sun.tools.javac.code.Symbol.VarSymbol;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    41
import com.sun.tools.javac.code.Symtab;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    42
import com.sun.tools.javac.code.Type;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    43
import com.sun.tools.javac.code.Type.MethodType;
27855
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
    44
import com.sun.tools.javac.code.Type.TypeVar;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    45
import com.sun.tools.javac.code.Types;
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
    46
import com.sun.tools.javac.comp.LambdaToMethod.LambdaAnalyzerPreprocessor.*;
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
    47
import com.sun.tools.javac.comp.Lower.BasicFreeVarCollector;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    48
import com.sun.tools.javac.jvm.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    49
import com.sun.tools.javac.util.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    50
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    51
import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    52
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
    53
import java.util.EnumMap;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    54
import java.util.HashMap;
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
    55
import java.util.HashSet;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    56
import java.util.LinkedHashMap;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    57
import java.util.Map;
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
    58
import java.util.Set;
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
    59
import java.util.function.Consumer;
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
    60
import java.util.function.Supplier;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    61
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    62
import static com.sun.tools.javac.comp.LambdaToMethod.LambdaSymbolKind.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    63
import static com.sun.tools.javac.code.Flags.*;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26990
diff changeset
    64
import static com.sun.tools.javac.code.Kinds.Kind.*;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    65
import static com.sun.tools.javac.code.TypeTag.*;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    66
import static com.sun.tools.javac.tree.JCTree.Tag.*;
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
    67
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
    68
import javax.lang.model.element.ElementKind;
27855
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
    69
import javax.lang.model.type.TypeKind;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    70
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    71
/**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    72
 * This pass desugars lambda expressions into static methods
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    73
 *
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    74
 *  <p><b>This is NOT part of any supported API.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    75
 *  If you write code that depends on this, you do so at your own risk.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    76
 *  This code and its internal interfaces are subject to change or
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    77
 *  deletion without notice.</b>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    78
 */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    79
public class LambdaToMethod extends TreeTranslator {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    80
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
    81
    private Attr attr;
18386
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
    82
    private JCDiagnostic.Factory diags;
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
    83
    private Log log;
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
    84
    private Lower lower;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    85
    private Names names;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    86
    private Symtab syms;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    87
    private Resolve rs;
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28591
diff changeset
    88
    private Operators operators;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    89
    private TreeMaker make;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    90
    private Types types;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    91
    private TransTypes transTypes;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    92
    private Env<AttrContext> attrEnv;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    93
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    94
    /** the analyzer scanner */
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
    95
    private LambdaAnalyzerPreprocessor analyzer;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    96
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    97
    /** map from lambda trees to translation contexts */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    98
    private Map<JCTree, TranslationContext<?>> contextMap;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    99
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   100
    /** current translation context (visitor argument) */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   101
    private TranslationContext<?> context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   102
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   103
    /** info about the current class being processed */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   104
    private KlassInfo kInfo;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   105
18386
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
   106
    /** dump statistics about lambda code generation */
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
   107
    private boolean dumpLambdaToMethodStats;
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
   108
22687
53157805d7e4 8031023: [javac] LambdaToMethod is missing forceSerializedRepresentation logic and switch
ksrini
parents: 22165
diff changeset
   109
    /** force serializable representation, for stress testing **/
53157805d7e4 8031023: [javac] LambdaToMethod is missing forceSerializedRepresentation logic and switch
ksrini
parents: 22165
diff changeset
   110
    private final boolean forceSerializable;
53157805d7e4 8031023: [javac] LambdaToMethod is missing forceSerializedRepresentation logic and switch
ksrini
parents: 22165
diff changeset
   111
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   112
    /** Flag for alternate metafactories indicating the lambda object is intended to be serializable */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   113
    public static final int FLAG_SERIALIZABLE = 1 << 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   114
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   115
    /** Flag for alternate metafactories indicating the lambda object has multiple targets */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   116
    public static final int FLAG_MARKERS = 1 << 1;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   117
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
   118
    /** Flag for alternate metafactories indicating the lambda object requires multiple bridges */
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
   119
    public static final int FLAG_BRIDGES = 1 << 2;
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
   120
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   121
    // <editor-fold defaultstate="collapsed" desc="Instantiating">
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22162
diff changeset
   122
    protected static final Context.Key<LambdaToMethod> unlambdaKey = new Context.Key<>();
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   123
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   124
    public static LambdaToMethod instance(Context context) {
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   125
        LambdaToMethod instance = context.get(unlambdaKey);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   126
        if (instance == null) {
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   127
            instance = new LambdaToMethod(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   128
        }
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   129
        return instance;
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   130
    }
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   131
    private LambdaToMethod(Context context) {
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   132
        context.put(unlambdaKey, this);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   133
        diags = JCDiagnostic.Factory.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   134
        log = Log.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   135
        lower = Lower.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   136
        names = Names.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   137
        syms = Symtab.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   138
        rs = Resolve.instance(context);
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28591
diff changeset
   139
        operators = Operators.instance(context);
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   140
        make = TreeMaker.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   141
        types = Types.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   142
        transTypes = TransTypes.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   143
        analyzer = new LambdaAnalyzerPreprocessor();
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   144
        Options options = Options.instance(context);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   145
        dumpLambdaToMethodStats = options.isSet("dumpLambdaToMethodStats");
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   146
        attr = Attr.instance(context);
22687
53157805d7e4 8031023: [javac] LambdaToMethod is missing forceSerializedRepresentation logic and switch
ksrini
parents: 22165
diff changeset
   147
        forceSerializable = options.isSet("forceSerializable");
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   148
    }
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   149
    // </editor-fold>
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
   150
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   151
    private class KlassInfo {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   152
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   153
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   154
         * list of methods to append
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   155
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   156
        private ListBuffer<JCTree> appendedMethodList;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   157
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   158
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   159
         * list of deserialization cases
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   160
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   161
        private final Map<String, ListBuffer<JCStatement>> deserializeCases;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   162
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   163
       /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   164
         * deserialize method symbol
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   165
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   166
        private final MethodSymbol deserMethodSym;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   167
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   168
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   169
         * deserialize method parameter symbol
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   170
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   171
        private final VarSymbol deserParamSym;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   172
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   173
        private final JCClassDecl clazz;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   174
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   175
        private KlassInfo(JCClassDecl clazz) {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   176
            this.clazz = clazz;
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   177
            appendedMethodList = new ListBuffer<>();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22162
diff changeset
   178
            deserializeCases = new HashMap<>();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   179
            MethodType type = new MethodType(List.of(syms.serializedLambdaType), syms.objectType,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   180
                    List.<Type>nil(), syms.methodClass);
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   181
            deserMethodSym = makePrivateSyntheticMethod(STATIC, names.deserializeLambda, type, clazz.sym);
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   182
            deserParamSym = new VarSymbol(FINAL, names.fromString("lambda"),
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   183
                    syms.serializedLambdaType, deserMethodSym);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   184
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   185
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   186
        private void addMethod(JCTree decl) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   187
            appendedMethodList = appendedMethodList.prepend(decl);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   188
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   189
    }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   190
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   191
    // <editor-fold defaultstate="collapsed" desc="translate methods">
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   192
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   193
    public <T extends JCTree> T translate(T tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   194
        TranslationContext<?> newContext = contextMap.get(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   195
        return translate(tree, newContext != null ? newContext : context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   196
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   197
17585
bf56a85f3897 8010006: NPE in javac with interface super in lambda
rfield
parents: 17578
diff changeset
   198
    <T extends JCTree> T translate(T tree, TranslationContext<?> newContext) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   199
        TranslationContext<?> prevContext = context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   200
        try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   201
            context = newContext;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   202
            return super.translate(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   203
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   204
        finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   205
            context = prevContext;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   206
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   207
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   208
17585
bf56a85f3897 8010006: NPE in javac with interface super in lambda
rfield
parents: 17578
diff changeset
   209
    <T extends JCTree> List<T> translate(List<T> trees, TranslationContext<?> newContext) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   210
        ListBuffer<T> buf = new ListBuffer<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   211
        for (T tree : trees) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   212
            buf.append(translate(tree, newContext));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   213
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   214
        return buf.toList();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   215
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   216
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   217
    public JCTree translateTopLevelClass(Env<AttrContext> env, JCTree cdef, TreeMaker make) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   218
        this.make = make;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   219
        this.attrEnv = env;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   220
        this.context = null;
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22162
diff changeset
   221
        this.contextMap = new HashMap<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   222
        return translate(cdef);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   223
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   224
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   225
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   226
    // <editor-fold defaultstate="collapsed" desc="visitor methods">
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   227
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   228
     * Visit a class.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   229
     * Maintain the translatedMethodList across nested classes.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   230
     * Append the translatedMethodList to the class after it is translated.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   231
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   232
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   233
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   234
    public void visitClassDef(JCClassDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   235
        if (tree.sym.owner.kind == PCK) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   236
            //analyze class
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   237
            tree = analyzer.analyzeAndPreprocessClass(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   238
        }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   239
        KlassInfo prevKlassInfo = kInfo;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   240
        try {
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   241
            kInfo = new KlassInfo(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   242
            super.visitClassDef(tree);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   243
            if (!kInfo.deserializeCases.isEmpty()) {
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   244
                int prevPos = make.pos;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   245
                try {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   246
                    make.at(tree);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   247
                    kInfo.addMethod(makeDeserializeMethod(tree.sym));
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   248
                } finally {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   249
                    make.at(prevPos);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   250
                }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   251
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   252
            //add all translated instance methods here
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   253
            List<JCTree> newMethods = kInfo.appendedMethodList.toList();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   254
            tree.defs = tree.defs.appendList(newMethods);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   255
            for (JCTree lambda : newMethods) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   256
                tree.sym.members().enter(((JCMethodDecl)lambda).sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   257
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   258
            result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   259
        } finally {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   260
            kInfo = prevKlassInfo;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   261
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   262
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   263
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   264
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   265
     * Translate a lambda into a method to be inserted into the class.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   266
     * Then replace the lambda site with an invokedynamic call of to lambda
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   267
     * meta-factory, which will use the lambda method.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   268
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   269
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   270
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   271
    public void visitLambda(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   272
        LambdaTranslationContext localContext = (LambdaTranslationContext)context;
28452
6afa05455443 8037546: javac -parameters does not emit parameter names for lambda expressions
jlahoda
parents: 28145
diff changeset
   273
        MethodSymbol sym = localContext.translatedSym;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   274
        MethodType lambdaType = (MethodType) sym.type;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   275
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   276
        {   /* Type annotation management: Based on where the lambda features, type annotations that
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   277
               are interior to it, may at this point be attached to the enclosing method, or the first
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   278
               constructor in the class, or in the enclosing class symbol or in the field whose
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   279
               initializer is the lambda. In any event, gather up the annotations that belong to the
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   280
               lambda and attach it to the implementation method.
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   281
            */
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   282
19651
b1aa46cc2198 8023515: import type-annotations updates
jjg
parents: 19487
diff changeset
   283
            Symbol owner = localContext.owner;
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   284
            apportionTypeAnnotations(tree,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   285
                    owner::getRawTypeAttributes,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   286
                    owner::setTypeAttributes,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   287
                    sym::setTypeAttributes);
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   288
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
   289
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   290
            boolean init;
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   291
            if ((init = (owner.name == names.init)) || owner.name == names.clinit) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   292
                owner = owner.owner;
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   293
                apportionTypeAnnotations(tree,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   294
                        init ? owner::getInitTypeAttributes : owner::getClassInitTypeAttributes,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   295
                        init ? owner::setInitTypeAttributes : owner::setClassInitTypeAttributes,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   296
                        sym::appendUniqueTypeAttributes);
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
   297
            }
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   298
            if (localContext.self != null && localContext.self.getKind() == ElementKind.FIELD) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   299
                owner = localContext.self;
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   300
                apportionTypeAnnotations(tree,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   301
                        owner::getRawTypeAttributes,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   302
                        owner::setTypeAttributes,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   303
                        sym::appendUniqueTypeAttributes);
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
   304
            }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
   305
        }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
   306
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   307
        //create the method declaration hoisting the lambda body
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   308
        JCMethodDecl lambdaDecl = make.MethodDef(make.Modifiers(sym.flags_field),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   309
                sym.name,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   310
                make.QualIdent(lambdaType.getReturnType().tsym),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   311
                List.<JCTypeParameter>nil(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   312
                localContext.syntheticParams,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   313
                lambdaType.getThrownTypes() == null ?
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   314
                    List.<JCExpression>nil() :
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   315
                    make.Types(lambdaType.getThrownTypes()),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   316
                null,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   317
                null);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   318
        lambdaDecl.sym = sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   319
        lambdaDecl.type = lambdaType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   320
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   321
        //translate lambda body
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   322
        //As the lambda body is translated, all references to lambda locals,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   323
        //captured variables, enclosing members are adjusted accordingly
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   324
        //to refer to the static method parameters (rather than i.e. acessing to
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   325
        //captured members directly).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   326
        lambdaDecl.body = translate(makeLambdaBody(tree, lambdaDecl));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   327
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   328
        //Add the method to the list of methods to be added to this class.
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   329
        kInfo.addMethod(lambdaDecl);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   330
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   331
        //now that we have generated a method for the lambda expression,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   332
        //we can translate the lambda into a method reference pointing to the newly
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   333
        //created method.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   334
        //
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   335
        //Note that we need to adjust the method handle so that it will match the
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   336
        //signature of the SAM descriptor - this means that the method reference
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   337
        //should be added the following synthetic arguments:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   338
        //
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   339
        // * the "this" argument if it is an instance method
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   340
        // * enclosing locals captured by the lambda expression
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   341
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   342
        ListBuffer<JCExpression> syntheticInits = new ListBuffer<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   343
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   344
        if (localContext.methodReferenceReceiver != null) {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   345
            syntheticInits.append(localContext.methodReferenceReceiver);
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   346
        } else if (!sym.isStatic()) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   347
            syntheticInits.append(makeThis(
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   348
                    sym.owner.enclClass().asType(),
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   349
                    localContext.owner.enclClass()));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   350
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   351
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   352
        //add captured locals
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   353
        for (Symbol fv : localContext.getSymbolMap(CAPTURED_VAR).keySet()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   354
            if (fv != localContext.self) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   355
                JCTree captured_local = make.Ident(fv).setType(fv.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   356
                syntheticInits.append((JCExpression) captured_local);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   357
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   358
        }
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   359
        // add captured outer this instances (used only when `this' capture itself is illegal)
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   360
        for (Symbol fv : localContext.getSymbolMap(CAPTURED_OUTER_THIS).keySet()) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   361
            JCTree captured_local = make.QualThis(fv.type);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   362
            syntheticInits.append((JCExpression) captured_local);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   363
        }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   364
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   365
        //then, determine the arguments to the indy call
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   366
        List<JCExpression> indy_args = translate(syntheticInits.toList(), localContext.prev);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   367
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   368
        //build a sam instance using an indy call to the meta-factory
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   369
        int refKind = referenceKind(sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   370
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   371
        //convert to an invokedynamic call
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
   372
        result = makeMetafactoryIndyCall(context, refKind, sym, indy_args);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   373
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   374
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   375
    // where
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   376
        // Reassign type annotations from the source that should really belong to the lambda
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   377
        private void apportionTypeAnnotations(JCLambda tree,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   378
                                              Supplier<List<Attribute.TypeCompound>> source,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   379
                                              Consumer<List<Attribute.TypeCompound>> owner,
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   380
                                              Consumer<List<Attribute.TypeCompound>> lambda) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   381
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   382
            ListBuffer<Attribute.TypeCompound> ownerTypeAnnos = new ListBuffer<>();
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   383
            ListBuffer<Attribute.TypeCompound> lambdaTypeAnnos = new ListBuffer<>();
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   384
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   385
            for (Attribute.TypeCompound tc : source.get()) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   386
                if (tc.position.onLambda == tree) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   387
                    lambdaTypeAnnos.append(tc);
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   388
                } else {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   389
                    ownerTypeAnnos.append(tc);
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   390
                }
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   391
            }
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   392
            if (lambdaTypeAnnos.nonEmpty()) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   393
                owner.accept(ownerTypeAnnos.toList());
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   394
                lambda.accept(lambdaTypeAnnos.toList());
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   395
            }
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   396
        }
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33710
diff changeset
   397
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   398
    private JCIdent makeThis(Type type, Symbol owner) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   399
        VarSymbol _this = new VarSymbol(PARAMETER | FINAL | SYNTHETIC,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   400
                names._this,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   401
                type,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   402
                owner);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   403
        return make.Ident(_this);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   404
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   405
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   406
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   407
     * Translate a method reference into an invokedynamic call to the
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   408
     * meta-factory.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   409
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   410
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   411
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   412
    public void visitReference(JCMemberReference tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   413
        ReferenceTranslationContext localContext = (ReferenceTranslationContext)context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   414
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   415
        //first determine the method symbol to be used to generate the sam instance
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   416
        //this is either the method reference symbol, or the bridged reference symbol
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   417
        Symbol refSym = localContext.isSignaturePolymorphic()
21892
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
   418
                ? localContext.sigPolySym
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
   419
                : tree.sym;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   420
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   421
        //the qualifying expression is treated as a special captured arg
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   422
        JCExpression init;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   423
        switch(tree.kind) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   424
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   425
            case IMPLICIT_INNER:    /** Inner :: new */
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   426
            case SUPER:             /** super :: instMethod */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   427
                init = makeThis(
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   428
                    localContext.owner.enclClass().asType(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   429
                    localContext.owner.enclClass());
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   430
                break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   431
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   432
            case BOUND:             /** Expr :: instMethod */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   433
                init = tree.getQualifierExpression();
20245
c351f524fbc6 8024696: Missing null check in bound method reference capture
vromero
parents: 19941
diff changeset
   434
                init = attr.makeNullCheck(init);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   435
                break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   436
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   437
            case UNBOUND:           /** Type :: instMethod */
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   438
            case STATIC:            /** Type :: staticMethod */
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   439
            case TOPLEVEL:          /** Top level :: new */
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   440
            case ARRAY_CTOR:        /** ArrayType :: new */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   441
                init = null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   442
                break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   443
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   444
            default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   445
                throw new InternalError("Should not have an invalid kind");
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   446
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   447
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   448
        List<JCExpression> indy_args = init==null? List.<JCExpression>nil() : translate(List.of(init), localContext.prev);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   449
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   450
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   451
        //build a sam instance using an indy call to the meta-factory
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
   452
        result = makeMetafactoryIndyCall(localContext, localContext.referenceKind(), refSym, indy_args);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   453
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   454
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   455
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   456
     * Translate identifiers within a lambda to the mapped identifier
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   457
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   458
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   459
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   460
    public void visitIdent(JCIdent tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   461
        if (context == null || !analyzer.lambdaIdentSymbolFilter(tree.sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   462
            super.visitIdent(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   463
        } else {
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   464
            int prevPos = make.pos;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   465
            try {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   466
                make.at(tree);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   467
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   468
                LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   469
                JCTree ltree = lambdaContext.translate(tree);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   470
                if (ltree != null) {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   471
                    result = ltree;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   472
                } else {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   473
                    //access to untranslated symbols (i.e. compile-time constants,
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   474
                    //members defined inside the lambda body, etc.) )
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   475
                    super.visitIdent(tree);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   476
                }
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   477
            } finally {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   478
                make.at(prevPos);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   479
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   480
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   481
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   482
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   483
    /**
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   484
     * Translate qualified `this' references within a lambda to the mapped identifier
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   485
     * @param tree
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   486
     */
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   487
    @Override
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   488
    public void visitSelect(JCFieldAccess tree) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   489
        if (context == null || !analyzer.lambdaFieldAccessFilter(tree)) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   490
            super.visitSelect(tree);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   491
        } else {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   492
            int prevPos = make.pos;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   493
            try {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   494
                make.at(tree);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   495
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   496
                LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   497
                JCTree ltree = lambdaContext.translate(tree);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   498
                if (ltree != null) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   499
                    result = ltree;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   500
                } else {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   501
                    super.visitSelect(tree);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   502
                }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   503
            } finally {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   504
                make.at(prevPos);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   505
            }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   506
        }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   507
    }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
   508
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   509
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   510
    public void visitVarDef(JCVariableDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   511
        LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   512
        if (context != null && lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) {
24224
b31b4a230595 8036942: javac generates incorrect exception table for multi-catch statements inside a lambda
rfield
parents: 23970
diff changeset
   513
            tree.init = translate(tree.init);
b31b4a230595 8036942: javac generates incorrect exception table for multi-catch statements inside a lambda
rfield
parents: 23970
diff changeset
   514
            tree.sym = (VarSymbol) lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym);
b31b4a230595 8036942: javac generates incorrect exception table for multi-catch statements inside a lambda
rfield
parents: 23970
diff changeset
   515
            result = tree;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   516
        } else if (context != null && lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   517
            JCExpression init = translate(tree.init);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   518
            VarSymbol xsym = (VarSymbol)lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym);
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   519
            int prevPos = make.pos;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   520
            try {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   521
                result = make.at(tree).VarDef(xsym, init);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   522
            } finally {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   523
                make.at(prevPos);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   524
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   525
            // Replace the entered symbol for this variable
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25281
diff changeset
   526
            WriteableScope sc = tree.sym.owner.members();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   527
            if (sc != null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   528
                sc.remove(tree.sym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   529
                sc.enter(xsym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   530
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   531
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   532
            super.visitVarDef(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   533
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   534
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   535
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   536
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   537
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   538
    // <editor-fold defaultstate="collapsed" desc="Translation helper methods">
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   539
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   540
    private JCBlock makeLambdaBody(JCLambda tree, JCMethodDecl lambdaMethodDecl) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   541
        return tree.getBodyKind() == JCLambda.BodyKind.EXPRESSION ?
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   542
                makeLambdaExpressionBody((JCExpression)tree.body, lambdaMethodDecl) :
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   543
                makeLambdaStatementBody((JCBlock)tree.body, lambdaMethodDecl, tree.canCompleteNormally);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   544
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   545
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   546
    private JCBlock makeLambdaExpressionBody(JCExpression expr, JCMethodDecl lambdaMethodDecl) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   547
        Type restype = lambdaMethodDecl.type.getReturnType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   548
        boolean isLambda_void = expr.type.hasTag(VOID);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   549
        boolean isTarget_void = restype.hasTag(VOID);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   550
        boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type);
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   551
        int prevPos = make.pos;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   552
        try {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   553
            if (isTarget_void) {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   554
                //target is void:
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   555
                // BODY;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   556
                JCStatement stat = make.at(expr).Exec(expr);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   557
                return make.Block(0, List.<JCStatement>of(stat));
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   558
            } else if (isLambda_void && isTarget_Void) {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   559
                //void to Void conversion:
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   560
                // BODY; return null;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   561
                ListBuffer<JCStatement> stats = new ListBuffer<>();
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   562
                stats.append(make.at(expr).Exec(expr));
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   563
                stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType)));
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   564
                return make.Block(0, stats.toList());
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   565
            } else {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   566
                //non-void to non-void conversion:
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   567
                // return (TYPE)BODY;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   568
                JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   569
                return make.at(retExpr).Block(0, List.<JCStatement>of(make.Return(retExpr)));
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   570
            }
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   571
        } finally {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
   572
            make.at(prevPos);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   573
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   574
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   575
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   576
    private JCBlock makeLambdaStatementBody(JCBlock block, final JCMethodDecl lambdaMethodDecl, boolean completeNormally) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   577
        final Type restype = lambdaMethodDecl.type.getReturnType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   578
        final boolean isTarget_void = restype.hasTag(VOID);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   579
        boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   580
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   581
        class LambdaBodyTranslator extends TreeTranslator {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   582
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   583
            @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   584
            public void visitClassDef(JCClassDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   585
                //do NOT recurse on any inner classes
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   586
                result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   587
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   588
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   589
            @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   590
            public void visitLambda(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   591
                //do NOT recurse on any nested lambdas
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   592
                result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   593
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   594
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   595
            @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   596
            public void visitReturn(JCReturn tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   597
                boolean isLambda_void = tree.expr == null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   598
                if (isTarget_void && !isLambda_void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   599
                    //Void to void conversion:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   600
                    // { TYPE $loc = RET-EXPR; return; }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   601
                    VarSymbol loc = makeSyntheticVar(0, names.fromString("$loc"), tree.expr.type, lambdaMethodDecl.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   602
                    JCVariableDecl varDef = make.VarDef(loc, tree.expr);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   603
                    result = make.Block(0, List.<JCStatement>of(varDef, make.Return(null)));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   604
                } else if (!isTarget_void || !isLambda_void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   605
                    //non-void to non-void conversion:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   606
                    // return (TYPE)RET-EXPR;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   607
                    tree.expr = transTypes.coerce(attrEnv, tree.expr, restype);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   608
                    result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   609
                } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   610
                    result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   611
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   612
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   613
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   614
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   615
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   616
        JCBlock trans_block = new LambdaBodyTranslator().translate(block);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   617
        if (completeNormally && isTarget_Void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   618
            //there's no return statement and the lambda (possibly inferred)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   619
            //return type is java.lang.Void; emit a synthetic return statement
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   620
            trans_block.stats = trans_block.stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType)));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   621
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   622
        return trans_block;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   623
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   624
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   625
    private JCMethodDecl makeDeserializeMethod(Symbol kSym) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   626
        ListBuffer<JCCase> cases = new ListBuffer<>();
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   627
        ListBuffer<JCBreak> breaks = new ListBuffer<>();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   628
        for (Map.Entry<String, ListBuffer<JCStatement>> entry : kInfo.deserializeCases.entrySet()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   629
            JCBreak br = make.Break(null);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   630
            breaks.add(br);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   631
            List<JCStatement> stmts = entry.getValue().append(br).toList();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   632
            cases.add(make.Case(make.Literal(entry.getKey()), stmts));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   633
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   634
        JCSwitch sw = make.Switch(deserGetter("getImplMethodName", syms.stringType), cases.toList());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   635
        for (JCBreak br : breaks) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   636
            br.target = sw;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   637
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   638
        JCBlock body = make.Block(0L, List.<JCStatement>of(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   639
                sw,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   640
                make.Throw(makeNewClass(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   641
                    syms.illegalArgumentExceptionType,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   642
                    List.<JCExpression>of(make.Literal("Invalid lambda deserialization"))))));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   643
        JCMethodDecl deser = make.MethodDef(make.Modifiers(kInfo.deserMethodSym.flags()),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   644
                        names.deserializeLambda,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   645
                        make.QualIdent(kInfo.deserMethodSym.getReturnType().tsym),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   646
                        List.<JCTypeParameter>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   647
                        List.of(make.VarDef(kInfo.deserParamSym, null)),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   648
                        List.<JCExpression>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   649
                        body,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   650
                        null);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   651
        deser.sym = kInfo.deserMethodSym;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   652
        deser.type = kInfo.deserMethodSym.type;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   653
        //System.err.printf("DESER: '%s'\n", deser);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   654
        return deser;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   655
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   656
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   657
    /** Make an attributed class instance creation expression.
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   658
     *  @param ctype    The class type.
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   659
     *  @param args     The constructor arguments.
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   660
     *  @param cons     The constructor symbol
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   661
     */
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   662
    JCNewClass makeNewClass(Type ctype, List<JCExpression> args, Symbol cons) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   663
        JCNewClass tree = make.NewClass(null,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   664
            null, make.QualIdent(ctype.tsym), args, null);
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   665
        tree.constructor = cons;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   666
        tree.type = ctype;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   667
        return tree;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   668
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   669
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   670
    /** Make an attributed class instance creation expression.
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   671
     *  @param ctype    The class type.
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   672
     *  @param args     The constructor arguments.
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   673
     */
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   674
    JCNewClass makeNewClass(Type ctype, List<JCExpression> args) {
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   675
        return makeNewClass(ctype, args,
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   676
                rs.resolveConstructor(null, attrEnv, ctype, TreeInfo.types(args), List.<Type>nil()));
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   677
     }
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
   678
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   679
    private void addDeserializationCase(int implMethodKind, Symbol refSym, Type targetType, MethodSymbol samSym,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   680
            DiagnosticPosition pos, List<Object> staticArgs, MethodType indyType) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   681
        String functionalInterfaceClass = classSig(targetType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   682
        String functionalInterfaceMethodName = samSym.getSimpleName().toString();
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
   683
        String functionalInterfaceMethodSignature = typeSig(types.erasure(samSym.type));
16335
4f7fe060522f 8009582: Method reference generic constructor gives: IllegalArgumentException: Invalid lambda deserialization
rfield
parents: 16332
diff changeset
   684
        String implClass = classSig(types.erasure(refSym.owner.type));
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   685
        String implMethodName = refSym.getQualifiedName().toString();
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
   686
        String implMethodSignature = typeSig(types.erasure(refSym.type));
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   687
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   688
        JCExpression kindTest = eqTest(syms.intType, deserGetter("getImplMethodKind", syms.intType), make.Literal(implMethodKind));
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   689
        ListBuffer<JCExpression> serArgs = new ListBuffer<>();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   690
        int i = 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   691
        for (Type t : indyType.getParameterTypes()) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   692
            List<JCExpression> indexAsArg = new ListBuffer<JCExpression>().append(make.Literal(i)).toList();
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   693
            List<Type> argTypes = new ListBuffer<Type>().append(syms.intType).toList();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   694
            serArgs.add(make.TypeCast(types.erasure(t), deserGetter("getCapturedArg", syms.objectType, argTypes, indexAsArg)));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   695
            ++i;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   696
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   697
        JCStatement stmt = make.If(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   698
                deserTest(deserTest(deserTest(deserTest(deserTest(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   699
                    kindTest,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   700
                    "getFunctionalInterfaceClass", functionalInterfaceClass),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   701
                    "getFunctionalInterfaceMethodName", functionalInterfaceMethodName),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   702
                    "getFunctionalInterfaceMethodSignature", functionalInterfaceMethodSignature),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   703
                    "getImplClass", implClass),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   704
                    "getImplMethodSignature", implMethodSignature),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   705
                make.Return(makeIndyCall(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   706
                    pos,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   707
                    syms.lambdaMetafactory,
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
   708
                    names.altMetafactory,
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
   709
                    staticArgs, indyType, serArgs.toList(), samSym.name)),
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   710
                null);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   711
        ListBuffer<JCStatement> stmts = kInfo.deserializeCases.get(implMethodName);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   712
        if (stmts == null) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   713
            stmts = new ListBuffer<>();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   714
            kInfo.deserializeCases.put(implMethodName, stmts);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   715
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   716
        /****
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   717
        System.err.printf("+++++++++++++++++\n");
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   718
        System.err.printf("*functionalInterfaceClass: '%s'\n", functionalInterfaceClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   719
        System.err.printf("*functionalInterfaceMethodName: '%s'\n", functionalInterfaceMethodName);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   720
        System.err.printf("*functionalInterfaceMethodSignature: '%s'\n", functionalInterfaceMethodSignature);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   721
        System.err.printf("*implMethodKind: %d\n", implMethodKind);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   722
        System.err.printf("*implClass: '%s'\n", implClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   723
        System.err.printf("*implMethodName: '%s'\n", implMethodName);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   724
        System.err.printf("*implMethodSignature: '%s'\n", implMethodSignature);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   725
        ****/
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   726
        stmts.append(stmt);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   727
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   728
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   729
    private JCExpression eqTest(Type argType, JCExpression arg1, JCExpression arg2) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   730
        JCBinary testExpr = make.Binary(JCTree.Tag.EQ, arg1, arg2);
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28591
diff changeset
   731
        testExpr.operator = operators.resolveBinary(testExpr, JCTree.Tag.EQ, argType, argType);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   732
        testExpr.setType(syms.booleanType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   733
        return testExpr;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   734
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   735
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   736
    private JCExpression deserTest(JCExpression prev, String func, String lit) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   737
        MethodType eqmt = new MethodType(List.of(syms.objectType), syms.booleanType, List.<Type>nil(), syms.methodClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   738
        Symbol eqsym = rs.resolveQualifiedMethod(null, attrEnv, syms.objectType, names.equals, List.of(syms.objectType), List.<Type>nil());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   739
        JCMethodInvocation eqtest = make.Apply(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   740
                List.<JCExpression>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   741
                make.Select(deserGetter(func, syms.stringType), eqsym).setType(eqmt),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   742
                List.<JCExpression>of(make.Literal(lit)));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   743
        eqtest.setType(syms.booleanType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   744
        JCBinary compound = make.Binary(JCTree.Tag.AND, prev, eqtest);
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28591
diff changeset
   745
        compound.operator = operators.resolveBinary(compound, JCTree.Tag.AND, syms.booleanType, syms.booleanType);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   746
        compound.setType(syms.booleanType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   747
        return compound;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   748
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   749
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   750
    private JCExpression deserGetter(String func, Type type) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   751
        return deserGetter(func, type, List.<Type>nil(), List.<JCExpression>nil());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   752
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   753
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   754
    private JCExpression deserGetter(String func, Type type, List<Type> argTypes, List<JCExpression> args) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   755
        MethodType getmt = new MethodType(argTypes, type, List.<Type>nil(), syms.methodClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   756
        Symbol getsym = rs.resolveQualifiedMethod(null, attrEnv, syms.serializedLambdaType, names.fromString(func), argTypes, List.<Type>nil());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   757
        return make.Apply(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   758
                    List.<JCExpression>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   759
                    make.Select(make.Ident(kInfo.deserParamSym).setType(syms.serializedLambdaType), getsym).setType(getmt),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   760
                    args).setType(type);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   761
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   762
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   763
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   764
     * Create new synthetic method with given flags, name, type, owner
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   765
     */
21014
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
   766
    private MethodSymbol makePrivateSyntheticMethod(long flags, Name name, Type type, Symbol owner) {
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
   767
        return new MethodSymbol(flags | SYNTHETIC | PRIVATE, name, type, owner);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   768
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   769
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   770
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   771
     * Create new synthetic variable with given flags, name, type, owner
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   772
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   773
    private VarSymbol makeSyntheticVar(long flags, String name, Type type, Symbol owner) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   774
        return makeSyntheticVar(flags, names.fromString(name), type, owner);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   775
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   776
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   777
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   778
     * Create new synthetic variable with given flags, name, type, owner
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   779
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   780
    private VarSymbol makeSyntheticVar(long flags, Name name, Type type, Symbol owner) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   781
        return new VarSymbol(flags | SYNTHETIC, name, type, owner);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   782
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   783
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   784
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   785
     * Set varargsElement field on a given tree (must be either a new class tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   786
     * or a method call tree)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   787
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   788
    private void setVarargsIfNeeded(JCTree tree, Type varargsElement) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   789
        if (varargsElement != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   790
            switch (tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   791
                case APPLY: ((JCMethodInvocation)tree).varargsElement = varargsElement; break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   792
                case NEWCLASS: ((JCNewClass)tree).varargsElement = varargsElement; break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   793
                default: throw new AssertionError();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   794
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   795
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   796
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   797
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   798
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   799
     * Convert method/constructor arguments by inserting appropriate cast
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   800
     * as required by type-erasure - this is needed when bridging a lambda/method
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   801
     * reference, as the bridged signature might require downcast to be compatible
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   802
     * with the generated signature.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   803
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   804
    private List<JCExpression> convertArgs(Symbol meth, List<JCExpression> args, Type varargsElement) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26990
diff changeset
   805
       Assert.check(meth.kind == MTH);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   806
       List<Type> formals = types.erasure(meth.type).getParameterTypes();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   807
       if (varargsElement != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   808
           Assert.check((meth.flags() & VARARGS) != 0);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   809
       }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   810
       return transTypes.translateArgs(args, formals, varargsElement, attrEnv);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   811
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   812
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   813
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   814
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   815
    /**
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   816
     * Converts a method reference which cannot be used directly into a lambda
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   817
     */
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   818
    private class MemberReferenceToLambda {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   819
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   820
        private final JCMemberReference tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   821
        private final ReferenceTranslationContext localContext;
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   822
        private final Symbol owner;
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   823
        private final ListBuffer<JCExpression> args = new ListBuffer<>();
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
   824
        private final ListBuffer<JCVariableDecl> params = new ListBuffer<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   825
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   826
        private JCExpression receiverExpression = null;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   827
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   828
        MemberReferenceToLambda(JCMemberReference tree, ReferenceTranslationContext localContext, Symbol owner) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   829
            this.tree = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   830
            this.localContext = localContext;
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   831
            this.owner = owner;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   832
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   833
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   834
        JCLambda lambda() {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   835
            int prevPos = make.pos;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   836
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   837
                make.at(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   838
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   839
                //body generation - this can be either a method call or a
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   840
                //new instance creation expression, depending on the member reference kind
27855
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   841
                VarSymbol rcvr = addParametersReturnReceiver();
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   842
                JCExpression expr = (tree.getMode() == ReferenceMode.INVOKE)
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   843
                        ? expressionInvoke(rcvr)
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   844
                        : expressionNew();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   845
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   846
                JCLambda slam = make.Lambda(params.toList(), expr);
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   847
                slam.targets = tree.targets;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   848
                slam.type = tree.type;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   849
                slam.pos = tree.pos;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   850
                return slam;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   851
            } finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   852
                make.at(prevPos);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   853
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   854
        }
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   855
27855
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   856
        /**
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   857
         * Generate the parameter list for the converted member reference.
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   858
         *
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   859
         * @return The receiver variable symbol, if any
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   860
         */
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   861
        VarSymbol addParametersReturnReceiver() {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   862
            Type samDesc = localContext.bridgedRefSig();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   863
            List<Type> samPTypes = samDesc.getParameterTypes();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   864
            List<Type> descPTypes = tree.getDescriptorType(types).getParameterTypes();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   865
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   866
            // Determine the receiver, if any
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   867
            VarSymbol rcvr;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   868
            switch (tree.kind) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   869
                case BOUND:
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   870
                    // The receiver is explicit in the method reference
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   871
                    rcvr = addParameter("rec$", tree.getQualifierExpression().type, false);
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   872
                    receiverExpression = attr.makeNullCheck(tree.getQualifierExpression());
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   873
                    break;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   874
                case UNBOUND:
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   875
                    // The receiver is the first parameter, extract it and
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   876
                    // adjust the SAM and unerased type lists accordingly
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   877
                    rcvr = addParameter("rec$", samDesc.getParameterTypes().head, false);
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   878
                    samPTypes = samPTypes.tail;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   879
                    descPTypes = descPTypes.tail;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   880
                    break;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   881
                default:
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   882
                    rcvr = null;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   883
                    break;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   884
            }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   885
            List<Type> implPTypes = tree.sym.type.getParameterTypes();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   886
            int implSize = implPTypes.size();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   887
            int samSize = samPTypes.size();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   888
            // Last parameter to copy from referenced method, exclude final var args
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   889
            int last = localContext.needsVarArgsConversion() ? implSize - 1 : implSize;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   890
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   891
            // Failsafe -- assure match-up
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   892
            boolean checkForIntersection = tree.varargsElement != null || implSize == descPTypes.size();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   893
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   894
            // Use parameter types of the implementation method unless the unerased
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   895
            // SAM parameter type is an intersection type, in that case use the
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   896
            // erased SAM parameter type so that the supertype relationship
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   897
            // the implementation method parameters is not obscured.
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   898
            // Note: in this loop, the lists implPTypes, samPTypes, and descPTypes
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   899
            // are used as pointers to the current parameter type information
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   900
            // and are thus not usable afterwards.
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   901
            for (int i = 0; implPTypes.nonEmpty() && i < last; ++i) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   902
                // By default use the implementation method parmeter type
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   903
                Type parmType = implPTypes.head;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   904
                // If the unerased parameter type is a type variable whose
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   905
                // bound is an intersection (eg. <T extends A & B>) then
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   906
                // use the SAM parameter type
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   907
                if (checkForIntersection && descPTypes.head.getKind() == TypeKind.TYPEVAR) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   908
                    TypeVar tv = (TypeVar) descPTypes.head;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   909
                    if (tv.bound.getKind() == TypeKind.INTERSECTION) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   910
                        parmType = samPTypes.head;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   911
                    }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   912
                }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   913
                addParameter("x$" + i, parmType, true);
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   914
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   915
                // Advance to the next parameter
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   916
                implPTypes = implPTypes.tail;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   917
                samPTypes = samPTypes.tail;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   918
                descPTypes = descPTypes.tail;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   919
            }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   920
            // Flatten out the var args
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   921
            for (int i = last; i < samSize; ++i) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   922
                addParameter("xva$" + i, tree.varargsElement, true);
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   923
            }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   924
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   925
            return rcvr;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   926
        }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
   927
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   928
        JCExpression getReceiverExpression() {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   929
            return receiverExpression;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   930
        }
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   931
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   932
        private JCExpression makeReceiver(VarSymbol rcvr) {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   933
            if (rcvr == null) return null;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   934
            JCExpression rcvrExpr = make.Ident(rcvr);
34472
ac6e7be35ea8 8143647: Javac compiles method reference that allows results in an IllegalAccessError
sadayapalam
parents: 33916
diff changeset
   935
            Type rcvrType = tree.ownerAccessible ? tree.sym.enclClass().type : tree.expr.type;
26990
e3fd4b46d39d 8056051: int[]::clone causes "java.lang.NoClassDefFoundError: Array"
rfield
parents: 25874
diff changeset
   936
            if (rcvrType == syms.arrayClass.type) {
e3fd4b46d39d 8056051: int[]::clone causes "java.lang.NoClassDefFoundError: Array"
rfield
parents: 25874
diff changeset
   937
                // Map the receiver type to the actually type, not just "array"
e3fd4b46d39d 8056051: int[]::clone causes "java.lang.NoClassDefFoundError: Array"
rfield
parents: 25874
diff changeset
   938
                rcvrType = tree.getQualifierExpression().type;
e3fd4b46d39d 8056051: int[]::clone causes "java.lang.NoClassDefFoundError: Array"
rfield
parents: 25874
diff changeset
   939
            }
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   940
            if (!rcvr.type.tsym.isSubClass(rcvrType.tsym, types)) {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   941
                rcvrExpr = make.TypeCast(make.Type(rcvrType), rcvrExpr).setType(rcvrType);
16327
01a0c0cb811c 8009154: Missing cast in method reference bridge leads to NoSuchMethodError
mcimadamore
parents: 16325
diff changeset
   942
            }
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   943
            return rcvrExpr;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   944
        }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   945
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   946
        /**
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   947
         * determine the receiver of the method call - the receiver can
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   948
         * be a type qualifier, the synthetic receiver parameter or 'super'.
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   949
         */
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   950
        private JCExpression expressionInvoke(VarSymbol rcvr) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   951
            JCExpression qualifier =
28453
9b94e84322e4 8068254: Method reference uses wrong qualifying type
jlahoda
parents: 28452
diff changeset
   952
                    (rcvr != null) ?
9b94e84322e4 8068254: Method reference uses wrong qualifying type
jlahoda
parents: 28452
diff changeset
   953
                        makeReceiver(rcvr) :
9b94e84322e4 8068254: Method reference uses wrong qualifying type
jlahoda
parents: 28452
diff changeset
   954
                        tree.getQualifierExpression();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   955
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   956
            //create the qualifier expression
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   957
            JCFieldAccess select = make.Select(qualifier, tree.sym.name);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   958
            select.sym = tree.sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   959
            select.type = tree.sym.erasure(types);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   960
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   961
            //create the method call expression
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   962
            JCExpression apply = make.Apply(List.<JCExpression>nil(), select,
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   963
                    convertArgs(tree.sym, args.toList(), tree.varargsElement)).
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   964
                    setType(tree.sym.erasure(types).getReturnType());
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   965
28591
25f1384324ae 8046977: ClassCastException: typing information needed for method reference bridging not preserved
jfranck
parents: 28453
diff changeset
   966
            apply = transTypes.coerce(attrEnv, apply,
25f1384324ae 8046977: ClassCastException: typing information needed for method reference bridging not preserved
jfranck
parents: 28453
diff changeset
   967
                    types.erasure(localContext.tree.referentType.getReturnType()));
25f1384324ae 8046977: ClassCastException: typing information needed for method reference bridging not preserved
jfranck
parents: 28453
diff changeset
   968
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   969
            setVarargsIfNeeded(apply, tree.varargsElement);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   970
            return apply;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   971
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   972
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   973
        /**
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   974
         * Lambda body to use for a 'new'.
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   975
         */
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   976
        private JCExpression expressionNew() {
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   977
            if (tree.kind == ReferenceKind.ARRAY_CTOR) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   978
                //create the array creation expression
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   979
                JCNewArray newArr = make.NewArray(
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   980
                        make.Type(types.elemtype(tree.getQualifierExpression().type)),
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   981
                        List.of(make.Ident(params.first())),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   982
                        null);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   983
                newArr.type = tree.getQualifierExpression().type;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   984
                return newArr;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   985
            } else {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   986
                //create the instance creation expression
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   987
                //note that method reference syntax does not allow an explicit
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   988
                //enclosing class (so the enclosing class is null)
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
   989
                JCNewClass newClass = make.NewClass(null,
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   990
                        List.<JCExpression>nil(),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   991
                        make.Type(tree.getQualifierExpression().type),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   992
                        convertArgs(tree.sym, args.toList(), tree.varargsElement),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   993
                        null);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   994
                newClass.constructor = tree.sym;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   995
                newClass.constructorType = tree.sym.erasure(types);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   996
                newClass.type = tree.getQualifierExpression().type;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   997
                setVarargsIfNeeded(newClass, tree.varargsElement);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   998
                return newClass;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   999
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1000
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1001
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1002
        private VarSymbol addParameter(String name, Type p, boolean genArg) {
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1003
            VarSymbol vsym = new VarSymbol(PARAMETER | SYNTHETIC, names.fromString(name), p, owner);
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1004
            vsym.pos = tree.pos;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1005
            params.append(make.VarDef(vsym, null));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1006
            if (genArg) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1007
                args.append(make.Ident(vsym));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1008
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1009
            return vsym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1010
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1011
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1012
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1013
    private MethodType typeToMethodType(Type mt) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1014
        Type type = types.erasure(mt);
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1015
        return new MethodType(type.getParameterTypes(),
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1016
                        type.getReturnType(),
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1017
                        type.getThrownTypes(),
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1018
                        syms.methodClass);
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1019
    }
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1020
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1021
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1022
     * Generate an indy method call to the meta factory
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1023
     */
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1024
    private JCExpression makeMetafactoryIndyCall(TranslationContext<?> context,
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1025
            int refKind, Symbol refSym, List<JCExpression> indy_args) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1026
        JCFunctionalExpression tree = context.tree;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1027
        //determine the static bsm args
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15360
diff changeset
  1028
        MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.type.tsym);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1029
        List<Object> staticArgs = List.<Object>of(
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1030
                typeToMethodType(samSym.type),
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14724
diff changeset
  1031
                new Pool.MethodHandle(refKind, refSym, types),
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1032
                typeToMethodType(tree.getDescriptorType(types)));
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1033
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1034
        //computed indy arg types
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
  1035
        ListBuffer<Type> indy_args_types = new ListBuffer<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1036
        for (JCExpression arg : indy_args) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1037
            indy_args_types.append(arg.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1038
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1039
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1040
        //finally, compute the type of the indy call
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1041
        MethodType indyType = new MethodType(indy_args_types.toList(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1042
                tree.type,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1043
                List.<Type>nil(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1044
                syms.methodClass);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1045
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1046
        Name metafactoryName = context.needsAltMetafactory() ?
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1047
                names.altMetafactory : names.metafactory;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1048
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1049
        if (context.needsAltMetafactory()) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
  1050
            ListBuffer<Object> markers = new ListBuffer<>();
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1051
            for (Type t : tree.targets.tail) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1052
                if (t.tsym != syms.serializableType.tsym) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1053
                    markers.append(t.tsym);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1054
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1055
            }
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1056
            int flags = context.isSerializable() ? FLAG_SERIALIZABLE : 0;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1057
            boolean hasMarkers = markers.nonEmpty();
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1058
            boolean hasBridges = context.bridges.nonEmpty();
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1059
            if (hasMarkers) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1060
                flags |= FLAG_MARKERS;
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1061
            }
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1062
            if (hasBridges) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1063
                flags |= FLAG_BRIDGES;
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1064
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1065
            staticArgs = staticArgs.append(flags);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1066
            if (hasMarkers) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1067
                staticArgs = staticArgs.append(markers.length());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1068
                staticArgs = staticArgs.appendList(markers.toList());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1069
            }
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1070
            if (hasBridges) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1071
                staticArgs = staticArgs.append(context.bridges.length() - 1);
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1072
                for (Symbol s : context.bridges) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1073
                    Type s_erasure = s.erasure(types);
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1074
                    if (!types.isSameType(s_erasure, samSym.erasure(types))) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1075
                        staticArgs = staticArgs.append(s.erasure(types));
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1076
                    }
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1077
                }
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1078
            }
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1079
            if (context.isSerializable()) {
21496
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1080
                int prevPos = make.pos;
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1081
                try {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1082
                    make.at(kInfo.clazz);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1083
                    addDeserializationCase(refKind, refSym, tree.type, samSym,
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1084
                            tree, staticArgs, indyType);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1085
                } finally {
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1086
                    make.at(prevPos);
2eb1bb11add1 8026861: Wrong LineNumberTable for variable declarations in lambdas
jlahoda
parents: 21495
diff changeset
  1087
                }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1088
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1089
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1090
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1091
        return makeIndyCall(tree, syms.lambdaMetafactory, metafactoryName, staticArgs, indyType, indy_args, samSym.name);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1092
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1093
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1094
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1095
     * Generate an indy method call with given name, type and static bootstrap
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1096
     * arguments types
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1097
     */
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1098
    private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmName,
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1099
            List<Object> staticArgs, MethodType indyType, List<JCExpression> indyArgs,
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1100
            Name methName) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1101
        int prevPos = make.pos;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1102
        try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1103
            make.at(pos);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1104
            List<Type> bsm_staticArgs = List.of(syms.methodHandleLookupType,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1105
                    syms.stringType,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1106
                    syms.methodTypeType).appendList(bsmStaticArgToTypes(staticArgs));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1107
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1108
            Symbol bsm = rs.resolveInternalMethod(pos, attrEnv, site,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1109
                    bsmName, bsm_staticArgs, List.<Type>nil());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1110
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1111
            DynamicMethodSymbol dynSym =
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1112
                    new DynamicMethodSymbol(methName,
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1113
                                            syms.noSymbol,
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1114
                                            bsm.isStatic() ?
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1115
                                                ClassFile.REF_invokeStatic :
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1116
                                                ClassFile.REF_invokeVirtual,
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1117
                                            (MethodSymbol)bsm,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1118
                                            indyType,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1119
                                            staticArgs.toArray());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1120
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1121
            JCFieldAccess qualifier = make.Select(make.QualIdent(site.tsym), bsmName);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1122
            qualifier.sym = dynSym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1123
            qualifier.type = indyType.getReturnType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1124
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1125
            JCMethodInvocation proxyCall = make.Apply(List.<JCExpression>nil(), qualifier, indyArgs);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1126
            proxyCall.type = indyType.getReturnType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1127
            return proxyCall;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1128
        } finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1129
            make.at(prevPos);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1130
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1131
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1132
    //where
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1133
    private List<Type> bsmStaticArgToTypes(List<Object> args) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
  1134
        ListBuffer<Type> argtypes = new ListBuffer<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1135
        for (Object arg : args) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1136
            argtypes.append(bsmStaticArgToType(arg));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1137
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1138
        return argtypes.toList();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1139
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1140
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1141
    private Type bsmStaticArgToType(Object arg) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1142
        Assert.checkNonNull(arg);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1143
        if (arg instanceof ClassSymbol) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1144
            return syms.classType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1145
        } else if (arg instanceof Integer) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1146
            return syms.intType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1147
        } else if (arg instanceof Long) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1148
            return syms.longType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1149
        } else if (arg instanceof Float) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1150
            return syms.floatType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1151
        } else if (arg instanceof Double) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1152
            return syms.doubleType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1153
        } else if (arg instanceof String) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1154
            return syms.stringType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1155
        } else if (arg instanceof Pool.MethodHandle) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1156
            return syms.methodHandleType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1157
        } else if (arg instanceof MethodType) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1158
            return syms.methodTypeType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1159
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1160
            Assert.error("bad static arg " + arg.getClass());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1161
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1162
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1163
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1164
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1165
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1166
     * Get the opcode associated with this method reference
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1167
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1168
    private int referenceKind(Symbol refSym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1169
        if (refSym.isConstructor()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1170
            return ClassFile.REF_newInvokeSpecial;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1171
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1172
            if (refSym.isStatic()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1173
                return ClassFile.REF_invokeStatic;
21014
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
  1174
            } else if ((refSym.flags() & PRIVATE) != 0) {
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
  1175
                return ClassFile.REF_invokeSpecial;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1176
            } else if (refSym.enclClass().isInterface()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1177
                return ClassFile.REF_invokeInterface;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1178
            } else {
21014
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
  1179
                return ClassFile.REF_invokeVirtual;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1180
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1181
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1182
    }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1183
16564
061aa10703e8 8009649: Lambda back-end should generate invokespecial for method handles referring to private instance methods
mcimadamore
parents: 16551
diff changeset
  1184
    // <editor-fold defaultstate="collapsed" desc="Lambda/reference analyzer">
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1185
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1186
     * This visitor collects information about translation of a lambda expression.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1187
     * More specifically, it keeps track of the enclosing contexts and captured locals
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1188
     * accessed by the lambda being translated (as well as other useful info).
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1189
     * It also translates away problems for LambdaToMethod.
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1190
     */
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1191
    class LambdaAnalyzerPreprocessor extends TreeTranslator {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1192
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1193
        /** the frame stack - used to reconstruct translation info about enclosing scopes */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1194
        private List<Frame> frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1195
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1196
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1197
         * keep the count of lambda expression (used to generate unambiguous
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1198
         * names)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1199
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1200
        private int lambdaCount = 0;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1201
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1202
        /**
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1203
         * List of types undergoing construction via explicit constructor chaining.
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1204
         */
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1205
        private List<ClassSymbol> typesUnderConstruction;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1206
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1207
        /**
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1208
         * keep the count of lambda expression defined in given context (used to
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1209
         * generate unambiguous names for serializable lambdas)
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1210
         */
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1211
        private class SyntheticMethodNameCounter {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1212
            private Map<String, Integer> map = new HashMap<>();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1213
            int getIndex(StringBuilder buf) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1214
                String temp = buf.toString();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1215
                Integer count = map.get(temp);
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1216
                if (count == null) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1217
                    count = 0;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1218
                }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1219
                ++count;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1220
                map.put(temp, count);
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1221
                return count;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1222
            }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1223
        }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1224
        private SyntheticMethodNameCounter syntheticMethodNameCounts =
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1225
                new SyntheticMethodNameCounter();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1226
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1227
        private Map<Symbol, JCClassDecl> localClassDefs;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1228
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1229
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1230
         * maps for fake clinit symbols to be used as owners of lambda occurring in
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1231
         * a static var init context
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1232
         */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22162
diff changeset
  1233
        private Map<ClassSymbol, Symbol> clinits = new HashMap<>();
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1234
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1235
        private JCClassDecl analyzeAndPreprocessClass(JCClassDecl tree) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1236
            frameStack = List.nil();
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1237
            typesUnderConstruction = List.nil();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22162
diff changeset
  1238
            localClassDefs = new HashMap<>();
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1239
            return translate(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1240
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1241
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1242
        @Override
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1243
        public void visitApply(JCMethodInvocation tree) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1244
            List<ClassSymbol> previousNascentTypes = typesUnderConstruction;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1245
            try {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1246
                Name methName = TreeInfo.name(tree.meth);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1247
                if (methName == names._this || methName == names._super) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1248
                    typesUnderConstruction = typesUnderConstruction.prepend(currentClass());
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1249
                }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1250
                super.visitApply(tree);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1251
            } finally {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1252
                typesUnderConstruction = previousNascentTypes;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1253
            }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1254
        }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1255
            // where
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1256
            private ClassSymbol currentClass() {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1257
                for (Frame frame : frameStack) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1258
                    if (frame.tree.hasTag(JCTree.Tag.CLASSDEF)) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1259
                        JCClassDecl cdef = (JCClassDecl) frame.tree;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1260
                        return cdef.sym;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1261
                    }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1262
                }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1263
                return null;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1264
            }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1265
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1266
        @Override
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1267
        public void visitBlock(JCBlock tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1268
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1269
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1270
                if (frameStack.nonEmpty() && frameStack.head.tree.hasTag(CLASSDEF)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1271
                    frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1272
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1273
                super.visitBlock(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1274
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1275
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1276
                frameStack = prevStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1277
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1278
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1279
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1280
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1281
        public void visitClassDef(JCClassDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1282
            List<Frame> prevStack = frameStack;
28145
365419055307 8067422: Lambda method names are unnecessarily unstable
jlahoda
parents: 27855
diff changeset
  1283
            int prevLambdaCount = lambdaCount;
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1284
            SyntheticMethodNameCounter prevSyntheticMethodNameCounts =
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1285
                    syntheticMethodNameCounts;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1286
            Map<ClassSymbol, Symbol> prevClinits = clinits;
18386
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
  1287
            DiagnosticSource prevSource = log.currentSource();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1288
            try {
18386
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
  1289
                log.useSource(tree.sym.sourcefile);
28145
365419055307 8067422: Lambda method names are unnecessarily unstable
jlahoda
parents: 27855
diff changeset
  1290
                lambdaCount = 0;
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1291
                syntheticMethodNameCounts = new SyntheticMethodNameCounter();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22162
diff changeset
  1292
                prevClinits = new HashMap<>();
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1293
                if (tree.sym.owner.kind == MTH) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1294
                    localClassDefs.put(tree.sym, tree);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1295
                }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1296
                if (directlyEnclosingLambda() != null) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1297
                    tree.sym.owner = owner();
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1298
                    if (tree.sym.hasOuterInstance()) {
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1299
                        //if a class is defined within a lambda, the lambda must capture
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1300
                        //its enclosing instance (if any)
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1301
                        TranslationContext<?> localContext = context();
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1302
                        final TypeSymbol outerInstanceSymbol = tree.sym.type.getEnclosingType().tsym;
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1303
                        while (localContext != null && !localContext.owner.isStatic()) {
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1304
                            if (localContext.tree.hasTag(LAMBDA)) {
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1305
                                JCTree block = capturedDecl(localContext.depth, outerInstanceSymbol);
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1306
                                if (block == null) break;
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1307
                                ((LambdaTranslationContext)localContext)
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1308
                                        .addSymbol(outerInstanceSymbol, CAPTURED_THIS);
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1309
                            }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1310
                            localContext = localContext.prev;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1311
                        }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1312
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1313
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1314
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1315
                super.visitClassDef(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1316
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1317
            finally {
18386
174879d5b5d0 8013576: Add stat support to LambdaToMethod
mcimadamore
parents: 18010
diff changeset
  1318
                log.useSource(prevSource.getFile());
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1319
                frameStack = prevStack;
28145
365419055307 8067422: Lambda method names are unnecessarily unstable
jlahoda
parents: 27855
diff changeset
  1320
                lambdaCount = prevLambdaCount;
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1321
                syntheticMethodNameCounts = prevSyntheticMethodNameCounts;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1322
                clinits = prevClinits;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1323
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1324
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1325
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1326
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1327
        public void visitIdent(JCIdent tree) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1328
            if (context() != null && lambdaIdentSymbolFilter(tree.sym)) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1329
                if (tree.sym.kind == VAR &&
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1330
                        tree.sym.owner.kind == MTH &&
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1331
                        tree.type.constValue() == null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1332
                    TranslationContext<?> localContext = context();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1333
                    while (localContext != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1334
                        if (localContext.tree.getTag() == LAMBDA) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1335
                            JCTree block = capturedDecl(localContext.depth, tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1336
                            if (block == null) break;
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1337
                            ((LambdaTranslationContext)localContext)
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1338
                                    .addSymbol(tree.sym, CAPTURED_VAR);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1339
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1340
                        localContext = localContext.prev;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1341
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1342
                } else if (tree.sym.owner.kind == TYP) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1343
                    TranslationContext<?> localContext = context();
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1344
                    while (localContext != null  && !localContext.owner.isStatic()) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1345
                        if (localContext.tree.hasTag(LAMBDA)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1346
                            JCTree block = capturedDecl(localContext.depth, tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1347
                            if (block == null) break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1348
                            switch (block.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1349
                                case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1350
                                    JCClassDecl cdecl = (JCClassDecl)block;
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1351
                                    ((LambdaTranslationContext)localContext)
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1352
                                            .addSymbol(cdecl.sym, CAPTURED_THIS);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1353
                                    break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1354
                                default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1355
                                    Assert.error("bad block kind");
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1356
                            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1357
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1358
                        localContext = localContext.prev;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1359
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1360
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1361
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1362
            super.visitIdent(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1363
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1364
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1365
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1366
        public void visitLambda(JCLambda tree) {
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1367
            analyzeLambda(tree, "lambda.stat");
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1368
        }
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1369
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1370
        private void analyzeLambda(JCLambda tree, JCExpression methodReferenceReceiver) {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1371
            // Translation of the receiver expression must occur first
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1372
            JCExpression rcvr = translate(methodReferenceReceiver);
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1373
            LambdaTranslationContext context = analyzeLambda(tree, "mref.stat.1");
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1374
            if (rcvr != null) {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1375
                context.methodReferenceReceiver = rcvr;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1376
            }
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1377
        }
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1378
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1379
        private LambdaTranslationContext analyzeLambda(JCLambda tree, String statKey) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1380
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1381
            try {
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1382
                LambdaTranslationContext context = new LambdaTranslationContext(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1383
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1384
                for (JCVariableDecl param : tree.params) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1385
                    context.addSymbol(param.sym, PARAM);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1386
                    frameStack.head.addLocal(param.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1387
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1388
                contextMap.put(tree, context);
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1389
                super.visitLambda(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1390
                context.complete();
33916
9b8030e8e0d9 8143217: javac throws NPE when printing diagnostics for Lambda expressions
sadayapalam
parents: 33712
diff changeset
  1391
                if (dumpLambdaToMethodStats) {
9b8030e8e0d9 8143217: javac throws NPE when printing diagnostics for Lambda expressions
sadayapalam
parents: 33712
diff changeset
  1392
                    log.note(tree, statKey, context.needsAltMetafactory(), context.translatedSym);
9b8030e8e0d9 8143217: javac throws NPE when printing diagnostics for Lambda expressions
sadayapalam
parents: 33712
diff changeset
  1393
                }
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1394
                return context;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1395
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1396
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1397
                frameStack = prevStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1398
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1399
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1400
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1401
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1402
        public void visitMethodDef(JCMethodDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1403
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1404
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1405
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1406
                super.visitMethodDef(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1407
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1408
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1409
                frameStack = prevStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1410
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1411
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1412
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1413
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1414
        public void visitNewClass(JCNewClass tree) {
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1415
            TypeSymbol def = tree.type.tsym;
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1416
            boolean inReferencedClass = currentlyInClass(def);
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1417
            boolean isLocal = def.isLocal();
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1418
            if ((inReferencedClass && isLocal || lambdaNewClassFilter(context(), tree))) {
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1419
                TranslationContext<?> localContext = context();
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1420
                final TypeSymbol outerInstanceSymbol = tree.type.getEnclosingType().tsym;
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1421
                while (localContext != null  && !localContext.owner.isStatic()) {
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1422
                    if (localContext.tree.hasTag(LAMBDA)) {
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1423
                        if (outerInstanceSymbol != null) {
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1424
                            JCTree block = capturedDecl(localContext.depth, outerInstanceSymbol);
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1425
                            if (block == null) break;
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1426
                        }
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1427
                        ((LambdaTranslationContext)localContext)
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1428
                                .addSymbol(outerInstanceSymbol, CAPTURED_THIS);
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1429
                    }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1430
                    localContext = localContext.prev;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1431
                }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1432
            }
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1433
            if (context() != null && !inReferencedClass && isLocal) {
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1434
                LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context();
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1435
                captureLocalClassDefs(def, lambdaContext);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1436
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1437
            super.visitNewClass(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1438
        }
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1439
        //where
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1440
            void captureLocalClassDefs(Symbol csym, final LambdaTranslationContext lambdaContext) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1441
                JCClassDecl localCDef = localClassDefs.get(csym);
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1442
                if (localCDef != null && lambdaContext.freeVarProcessedLocalClasses.add(csym)) {
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1443
                    BasicFreeVarCollector fvc = lower.new BasicFreeVarCollector() {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1444
                        @Override
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1445
                        void addFreeVars(ClassSymbol c) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1446
                            captureLocalClassDefs(c, lambdaContext);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1447
                        }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1448
                        @Override
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1449
                        void visitSymbol(Symbol sym) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1450
                            if (sym.kind == VAR &&
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1451
                                    sym.owner.kind == MTH &&
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1452
                                    ((VarSymbol)sym).getConstValue() == null) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1453
                                TranslationContext<?> localContext = context();
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1454
                                while (localContext != null) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1455
                                    if (localContext.tree.getTag() == LAMBDA) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1456
                                        JCTree block = capturedDecl(localContext.depth, sym);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1457
                                        if (block == null) break;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1458
                                        ((LambdaTranslationContext)localContext).addSymbol(sym, CAPTURED_VAR);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1459
                                    }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1460
                                    localContext = localContext.prev;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1461
                                }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1462
                            }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1463
                        }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1464
                    };
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1465
                    fvc.scan(localCDef);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  1466
                }
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1467
        }
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1468
        //where
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1469
        boolean currentlyInClass(Symbol csym) {
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1470
            for (Frame frame : frameStack) {
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1471
                if (frame.tree.hasTag(JCTree.Tag.CLASSDEF)) {
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1472
                    JCClassDecl cdef = (JCClassDecl) frame.tree;
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1473
                    if (cdef.sym == csym) {
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1474
                        return true;
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1475
                    }
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1476
                }
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1477
            }
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1478
            return false;
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1479
        }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1480
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1481
        /**
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1482
         * Method references to local class constructors, may, if the local
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1483
         * class references local variables, have implicit constructor
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1484
         * parameters added in Lower; As a result, the invokedynamic bootstrap
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1485
         * information added in the LambdaToMethod pass will have the wrong
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1486
         * signature. Hooks between Lower and LambdaToMethod have been added to
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1487
         * handle normal "new" in this case. This visitor converts potentially
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1488
         * affected method references into a lambda containing a normal
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1489
         * expression.
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1490
         *
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1491
         * @param tree
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1492
         */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1493
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1494
        public void visitReference(JCMemberReference tree) {
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1495
            ReferenceTranslationContext rcontext = new ReferenceTranslationContext(tree);
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1496
            contextMap.put(tree, rcontext);
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1497
            if (rcontext.needsConversionToLambda()) {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1498
                 // Convert to a lambda, and process as such
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1499
                MemberReferenceToLambda conv = new MemberReferenceToLambda(tree, rcontext, owner());
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1500
                analyzeLambda(conv.lambda(), conv.getReceiverExpression());
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1501
            } else {
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1502
                super.visitReference(tree);
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1503
                if (dumpLambdaToMethodStats) {
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1504
                    log.note(tree, "mref.stat", rcontext.needsAltMetafactory(), null);
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1505
                }
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1506
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1507
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1508
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1509
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1510
        public void visitSelect(JCFieldAccess tree) {
17585
bf56a85f3897 8010006: NPE in javac with interface super in lambda
rfield
parents: 17578
diff changeset
  1511
            if (context() != null && tree.sym.kind == VAR &&
bf56a85f3897 8010006: NPE in javac with interface super in lambda
rfield
parents: 17578
diff changeset
  1512
                        (tree.sym.name == names._this ||
bf56a85f3897 8010006: NPE in javac with interface super in lambda
rfield
parents: 17578
diff changeset
  1513
                         tree.sym.name == names._super)) {
bf56a85f3897 8010006: NPE in javac with interface super in lambda
rfield
parents: 17578
diff changeset
  1514
                // A select of this or super means, if we are in a lambda,
bf56a85f3897 8010006: NPE in javac with interface super in lambda
rfield
parents: 17578
diff changeset
  1515
                // we much have an instance context
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1516
                TranslationContext<?> localContext = context();
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1517
                while (localContext != null  && !localContext.owner.isStatic()) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1518
                    if (localContext.tree.hasTag(LAMBDA)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1519
                        JCClassDecl clazz = (JCClassDecl)capturedDecl(localContext.depth, tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1520
                        if (clazz == null) break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1521
                        ((LambdaTranslationContext)localContext).addSymbol(clazz.sym, CAPTURED_THIS);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1522
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1523
                    localContext = localContext.prev;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1524
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1525
            }
17286
fec581c36de4 8011591: BootstrapMethodError when capturing constructor ref to local classes
rfield
parents: 16798
diff changeset
  1526
            super.visitSelect(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1527
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1528
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1529
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1530
        public void visitVarDef(JCVariableDecl tree) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1531
            TranslationContext<?> context = context();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1532
            LambdaTranslationContext ltc = (context != null && context instanceof LambdaTranslationContext)?
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1533
                    (LambdaTranslationContext)context :
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1534
                    null;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1535
            if (ltc != null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1536
                if (frameStack.head.tree.hasTag(LAMBDA)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1537
                    ltc.addSymbol(tree.sym, LOCAL_VAR);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1538
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1539
                // Check for type variables (including as type arguments).
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1540
                // If they occur within class nested in a lambda, mark for erasure
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1541
                Type type = tree.sym.asType();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1542
                if (inClassWithinLambda() && !types.isSameType(types.erasure(type), type)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1543
                    ltc.addSymbol(tree.sym, TYPE_VAR);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1544
                }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1545
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1546
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1547
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1548
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1549
                if (tree.sym.owner.kind == MTH) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1550
                    frameStack.head.addLocal(tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1551
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1552
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1553
                super.visitVarDef(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1554
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1555
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1556
                frameStack = prevStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1557
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1558
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1559
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1560
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1561
         * Return a valid owner given the current declaration stack
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1562
         * (required to skip synthetic lambda symbols)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1563
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1564
        private Symbol owner() {
15379
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1565
            return owner(false);
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1566
        }
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1567
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1568
        @SuppressWarnings("fallthrough")
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1569
        private Symbol owner(boolean skipLambda) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1570
            List<Frame> frameStack2 = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1571
            while (frameStack2.nonEmpty()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1572
                switch (frameStack2.head.tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1573
                    case VARDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1574
                        if (((JCVariableDecl)frameStack2.head.tree).sym.isLocal()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1575
                            frameStack2 = frameStack2.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1576
                            break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1577
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1578
                        JCClassDecl cdecl = (JCClassDecl)frameStack2.tail.head.tree;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1579
                        return initSym(cdecl.sym,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1580
                                ((JCVariableDecl)frameStack2.head.tree).sym.flags() & STATIC);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1581
                    case BLOCK:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1582
                        JCClassDecl cdecl2 = (JCClassDecl)frameStack2.tail.head.tree;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1583
                        return initSym(cdecl2.sym,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1584
                                ((JCBlock)frameStack2.head.tree).flags & STATIC);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1585
                    case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1586
                        return ((JCClassDecl)frameStack2.head.tree).sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1587
                    case METHODDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1588
                        return ((JCMethodDecl)frameStack2.head.tree).sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1589
                    case LAMBDA:
15379
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1590
                        if (!skipLambda)
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1591
                            return ((LambdaTranslationContext)contextMap
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1592
                                    .get(frameStack2.head.tree)).translatedSym;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1593
                    default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1594
                        frameStack2 = frameStack2.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1595
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1596
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1597
            Assert.error();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1598
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1599
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1600
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1601
        private Symbol initSym(ClassSymbol csym, long flags) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1602
            boolean isStatic = (flags & STATIC) != 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1603
            if (isStatic) {
22162
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1604
                /* static clinits are generated in Gen, so we need to use a fake
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1605
                 * one. Attr creates a fake clinit method while attributing
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1606
                 * lambda expressions used as initializers of static fields, so
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1607
                 * let's use that one.
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1608
                 */
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1609
                MethodSymbol clinit = attr.removeClinit(csym);
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1610
                if (clinit != null) {
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1611
                    clinits.put(csym, clinit);
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1612
                    return clinit;
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1613
                }
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1614
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1615
                /* if no clinit is found at Attr, then let's try at clinits.
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1616
                 */
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1617
                clinit = (MethodSymbol)clinits.get(csym);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1618
                if (clinit == null) {
22162
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1619
                    /* no luck, let's create a new one
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1620
                     */
21014
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
  1621
                    clinit = makePrivateSyntheticMethod(STATIC,
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1622
                            names.clinit,
22162
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1623
                            new MethodType(List.<Type>nil(), syms.voidType,
3b3e23e67329 8029721: javac crash for annotated parameter type of lambda in a field
vromero
parents: 21892
diff changeset
  1624
                                List.<Type>nil(), syms.methodClass),
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1625
                            csym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1626
                    clinits.put(csym, clinit);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1627
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1628
                return clinit;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1629
            } else {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1630
                //get the first constructor and treat it as the instance init sym
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25281
diff changeset
  1631
                for (Symbol s : csym.members_field.getSymbolsByName(names.init)) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1632
                    return s;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1633
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1634
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1635
            Assert.error("init not found");
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1636
            return null;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1637
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1638
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1639
        private JCTree directlyEnclosingLambda() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1640
            if (frameStack.isEmpty()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1641
                return null;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1642
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1643
            List<Frame> frameStack2 = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1644
            while (frameStack2.nonEmpty()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1645
                switch (frameStack2.head.tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1646
                    case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1647
                    case METHODDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1648
                        return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1649
                    case LAMBDA:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1650
                        return frameStack2.head.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1651
                    default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1652
                        frameStack2 = frameStack2.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1653
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1654
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1655
            Assert.error();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1656
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1657
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1658
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1659
        private boolean inClassWithinLambda() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1660
            if (frameStack.isEmpty()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1661
                return false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1662
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1663
            List<Frame> frameStack2 = frameStack;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1664
            boolean classFound = false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1665
            while (frameStack2.nonEmpty()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1666
                switch (frameStack2.head.tree.getTag()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1667
                    case LAMBDA:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1668
                        return classFound;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1669
                    case CLASSDEF:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1670
                        classFound = true;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1671
                        frameStack2 = frameStack2.tail;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1672
                        break;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1673
                    default:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1674
                        frameStack2 = frameStack2.tail;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1675
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1676
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1677
            // No lambda
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1678
            return false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1679
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1680
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1681
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1682
         * Return the declaration corresponding to a symbol in the enclosing
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1683
         * scope; the depth parameter is used to filter out symbols defined
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1684
         * in nested scopes (which do not need to undergo capture).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1685
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1686
        private JCTree capturedDecl(int depth, Symbol sym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1687
            int currentDepth = frameStack.size() - 1;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1688
            for (Frame block : frameStack) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1689
                switch (block.tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1690
                    case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1691
                        ClassSymbol clazz = ((JCClassDecl)block.tree).sym;
31296
9a8e44b62c77 8076538: Verify error at runtime due to incorrect classification of a lambda as being instance capturing
sadayapalam
parents: 29772
diff changeset
  1692
                        if (clazz.isSubClass(sym, types) || sym.isMemberOf(clazz, types)) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1693
                            return currentDepth > depth ? null : block.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1694
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1695
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1696
                    case VARDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1697
                        if (((JCVariableDecl)block.tree).sym == sym &&
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1698
                                sym.owner.kind == MTH) { //only locals are captured
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1699
                            return currentDepth > depth ? null : block.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1700
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1701
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1702
                    case BLOCK:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1703
                    case METHODDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1704
                    case LAMBDA:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1705
                        if (block.locals != null && block.locals.contains(sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1706
                            return currentDepth > depth ? null : block.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1707
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1708
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1709
                    default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1710
                        Assert.error("bad decl kind " + block.tree.getTag());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1711
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1712
                currentDepth--;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1713
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1714
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1715
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1716
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1717
        private TranslationContext<?> context() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1718
            for (Frame frame : frameStack) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1719
                TranslationContext<?> context = contextMap.get(frame.tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1720
                if (context != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1721
                    return context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1722
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1723
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1724
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1725
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1726
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1727
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1728
         *  This is used to filter out those identifiers that needs to be adjusted
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1729
         *  when translating away lambda expressions
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1730
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1731
        private boolean lambdaIdentSymbolFilter(Symbol sym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1732
            return (sym.kind == VAR || sym.kind == MTH)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1733
                    && !sym.isStatic()
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1734
                    && sym.name != names.init;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1735
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1736
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1737
        /**
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1738
         *  This is used to filter out those select nodes that need to be adjusted
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1739
         *  when translating away lambda expressions - at the moment, this is the
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1740
         *  set of nodes that select `this' (qualified this)
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1741
         */
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1742
        private boolean lambdaFieldAccessFilter(JCFieldAccess fAccess) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1743
            LambdaTranslationContext lambdaContext =
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1744
                    context instanceof LambdaTranslationContext ?
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1745
                            (LambdaTranslationContext) context : null;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1746
            return lambdaContext != null
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1747
                    && !fAccess.sym.isStatic()
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1748
                    && fAccess.name == names._this
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1749
                    && (fAccess.sym.owner.kind == TYP)
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1750
                    && !lambdaContext.translatedSymbols.get(CAPTURED_OUTER_THIS).isEmpty();
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1751
        }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1752
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1753
        /**
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1754
         * This is used to filter out those new class expressions that need to
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1755
         * be qualified with an enclosing tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1756
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1757
        private boolean lambdaNewClassFilter(TranslationContext<?> context, JCNewClass tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1758
            if (context != null
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1759
                    && tree.encl == null
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1760
                    && tree.def == null
14537
ad188879b6fe 8003306: Compiler crash: calculation of inner class access modifier
rfield
parents: 14365
diff changeset
  1761
                    && !tree.type.getEnclosingType().hasTag(NONE)) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1762
                Type encl = tree.type.getEnclosingType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1763
                Type current = context.owner.enclClass().type;
14537
ad188879b6fe 8003306: Compiler crash: calculation of inner class access modifier
rfield
parents: 14365
diff changeset
  1764
                while (!current.hasTag(NONE)) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1765
                    if (current.tsym.isSubClass(encl.tsym, types)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1766
                        return true;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1767
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1768
                    current = current.getEnclosingType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1769
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1770
                return false;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1771
            } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1772
                return false;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1773
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1774
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1775
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1776
        private class Frame {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1777
            final JCTree tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1778
            List<Symbol> locals;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1779
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1780
            public Frame(JCTree tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1781
                this.tree = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1782
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1783
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1784
            void addLocal(Symbol sym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1785
                if (locals == null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1786
                    locals = List.nil();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1787
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1788
                locals = locals.prepend(sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1789
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1790
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1791
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1792
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1793
         * This class is used to store important information regarding translation of
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1794
         * lambda expression/method references (see subclasses).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1795
         */
29149
3fa94aad0264 8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents: 29051
diff changeset
  1796
        abstract class TranslationContext<T extends JCFunctionalExpression> {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1797
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1798
            /** the underlying (untranslated) tree */
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1799
            final T tree;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1800
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1801
            /** points to the adjusted enclosing scope in which this lambda/mref expression occurs */
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1802
            final Symbol owner;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1803
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1804
            /** the depth of this lambda expression in the frame stack */
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1805
            final int depth;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1806
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1807
            /** the enclosing translation context (set for nested lambdas/mref) */
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1808
            final TranslationContext<?> prev;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1809
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1810
            /** list of methods to be bridged by the meta-factory */
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1811
            final List<Symbol> bridges;
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1812
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1813
            TranslationContext(T tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1814
                this.tree = tree;
35418
8681d57fc3f8 8144168: No type annotations generated for nested lambdas
sadayapalam
parents: 34752
diff changeset
  1815
                this.owner = owner(true);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1816
                this.depth = frameStack.size() - 1;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1817
                this.prev = context();
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1818
                ClassSymbol csym =
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1819
                        types.makeFunctionalInterfaceClass(attrEnv, names.empty, tree.targets, ABSTRACT | INTERFACE);
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1820
                this.bridges = types.functionalInterfaceBridges(csym);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1821
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1822
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1823
            /** does this functional expression need to be created using alternate metafactory? */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1824
            boolean needsAltMetafactory() {
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1825
                return tree.targets.length() > 1 ||
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1826
                        isSerializable() ||
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1827
                        bridges.length() > 1;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1828
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1829
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1830
            /** does this functional expression require serialization support? */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1831
            boolean isSerializable() {
22687
53157805d7e4 8031023: [javac] LambdaToMethod is missing forceSerializedRepresentation logic and switch
ksrini
parents: 22165
diff changeset
  1832
                if (forceSerializable) {
53157805d7e4 8031023: [javac] LambdaToMethod is missing forceSerializedRepresentation logic and switch
ksrini
parents: 22165
diff changeset
  1833
                    return true;
53157805d7e4 8031023: [javac] LambdaToMethod is missing forceSerializedRepresentation logic and switch
ksrini
parents: 22165
diff changeset
  1834
                }
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1835
                for (Type target : tree.targets) {
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  1836
                    if (types.asSuper(target, syms.serializableType.tsym) != null) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1837
                        return true;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1838
                    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1839
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1840
                return false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1841
            }
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1842
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1843
            /**
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1844
             * @return Name of the enclosing method to be folded into synthetic
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1845
             * method name
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1846
             */
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1847
            String enclosingMethodName() {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1848
                return syntheticMethodNameComponent(owner.name);
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1849
            }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1850
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1851
            /**
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1852
             * @return Method name in a form that can be folded into a
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1853
             * component of a synthetic method name
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1854
             */
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1855
            String syntheticMethodNameComponent(Name name) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1856
                if (name == null) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1857
                    return "null";
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1858
                }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1859
                String methodName = name.toString();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1860
                if (methodName.equals("<clinit>")) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1861
                    methodName = "static";
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1862
                } else if (methodName.equals("<init>")) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1863
                    methodName = "new";
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1864
                }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1865
                return methodName;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1866
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1867
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1868
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1869
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1870
         * This class retains all the useful information about a lambda expression;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1871
         * the contents of this class are filled by the LambdaAnalyzer visitor,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1872
         * and the used by the main translation routines in order to adjust references
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1873
         * to captured locals/members, etc.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1874
         */
29149
3fa94aad0264 8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents: 29051
diff changeset
  1875
        class LambdaTranslationContext extends TranslationContext<JCLambda> {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1876
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1877
            /** variable in the enclosing context to which this lambda is assigned */
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1878
            final Symbol self;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1879
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1880
            /** variable in the enclosing context to which this lambda is assigned */
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1881
            final Symbol assignedTo;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1882
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  1883
            Map<LambdaSymbolKind, Map<Symbol, Symbol>> translatedSymbols;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1884
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1885
            /** the synthetic symbol for the method hoisting the translated lambda */
28452
6afa05455443 8037546: javac -parameters does not emit parameter names for lambda expressions
jlahoda
parents: 28145
diff changeset
  1886
            MethodSymbol translatedSym;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1887
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1888
            List<JCVariableDecl> syntheticParams;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1889
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1890
            /**
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1891
             * to prevent recursion, track local classes processed
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1892
             */
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1893
            final Set<Symbol> freeVarProcessedLocalClasses;
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1894
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1895
            /**
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1896
             * For method references converted to lambdas.  The method
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1897
             * reference receiver expression. Must be treated like a captured
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1898
             * variable.
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1899
             */
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1900
            JCExpression methodReferenceReceiver;
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  1901
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1902
            LambdaTranslationContext(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1903
                super(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1904
                Frame frame = frameStack.head;
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1905
                switch (frame.tree.getTag()) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1906
                    case VARDEF:
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1907
                        assignedTo = self = ((JCVariableDecl) frame.tree).sym;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1908
                        break;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1909
                    case ASSIGN:
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1910
                        self = null;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1911
                        assignedTo = TreeInfo.symbol(((JCAssign) frame.tree).getVariable());
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1912
                        break;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1913
                    default:
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1914
                        assignedTo = self = null;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1915
                        break;
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1916
                 }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1917
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1918
                // This symbol will be filled-in in complete
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1919
                this.translatedSym = makePrivateSyntheticMethod(0, null, null, owner.enclClass());
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1920
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  1921
                translatedSymbols = new EnumMap<>(LambdaSymbolKind.class);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  1922
22165
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  1923
                translatedSymbols.put(PARAM, new LinkedHashMap<Symbol, Symbol>());
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  1924
                translatedSymbols.put(LOCAL_VAR, new LinkedHashMap<Symbol, Symbol>());
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  1925
                translatedSymbols.put(CAPTURED_VAR, new LinkedHashMap<Symbol, Symbol>());
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  1926
                translatedSymbols.put(CAPTURED_THIS, new LinkedHashMap<Symbol, Symbol>());
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  1927
                translatedSymbols.put(CAPTURED_OUTER_THIS, new LinkedHashMap<Symbol, Symbol>());
22165
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  1928
                translatedSymbols.put(TYPE_VAR, new LinkedHashMap<Symbol, Symbol>());
24225
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1929
44f3a7b2ac71 8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
rfield
parents: 24224
diff changeset
  1930
                freeVarProcessedLocalClasses = new HashSet<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1931
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1932
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1933
             /**
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1934
             * For a serializable lambda, generate a disambiguating string
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1935
             * which maximizes stability across deserialization.
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1936
             *
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1937
             * @return String to differentiate synthetic lambda method names
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1938
             */
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1939
            private String serializedLambdaDisambiguation() {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1940
                StringBuilder buf = new StringBuilder();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1941
                // Append the enclosing method signature to differentiate
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1942
                // overloaded enclosing methods.  For lambdas enclosed in
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1943
                // lambdas, the generated lambda method will not have type yet,
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1944
                // but the enclosing method's name will have been generated
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1945
                // with this same method, so it will be unique and never be
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1946
                // overloaded.
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1947
                Assert.check(
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1948
                        owner.type != null ||
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1949
                        directlyEnclosingLambda() != null);
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1950
                if (owner.type != null) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1951
                    buf.append(typeSig(owner.type));
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1952
                    buf.append(":");
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1953
                }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1954
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1955
                // Add target type info
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1956
                buf.append(types.findDescriptorSymbol(tree.type.tsym).owner.flatName());
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1957
                buf.append(" ");
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1958
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1959
                // Add variable assigned to
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1960
                if (assignedTo != null) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1961
                    buf.append(assignedTo.flatName());
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1962
                    buf.append("=");
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1963
                }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1964
                //add captured locals info: type, name, order
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1965
                for (Symbol fv : getSymbolMap(CAPTURED_VAR).keySet()) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1966
                    if (fv != self) {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1967
                        buf.append(typeSig(fv.type));
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1968
                        buf.append(" ");
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1969
                        buf.append(fv.flatName());
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1970
                        buf.append(",");
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1971
                    }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1972
                }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1973
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1974
                return buf.toString();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1975
            }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1976
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1977
            /**
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1978
             * For a non-serializable lambda, generate a simple method.
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1979
             *
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1980
             * @return Name to use for the synthetic lambda method name
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1981
             */
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1982
            private Name lambdaName() {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1983
                return names.lambda.append(names.fromString(enclosingMethodName() + "$" + lambdaCount++));
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1984
            }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1985
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1986
            /**
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1987
             * For a serializable lambda, generate a method name which maximizes
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1988
             * name stability across deserialization.
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1989
             *
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1990
             * @return Name to use for the synthetic lambda method name
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1991
             */
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1992
            private Name serializedLambdaName() {
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1993
                StringBuilder buf = new StringBuilder();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1994
                buf.append(names.lambda);
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1995
                // Append the name of the method enclosing the lambda.
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1996
                buf.append(enclosingMethodName());
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1997
                buf.append('$');
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1998
                // Append a hash of the disambiguating string : enclosing method
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  1999
                // signature, etc.
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2000
                String disam = serializedLambdaDisambiguation();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2001
                buf.append(Integer.toHexString(disam.hashCode()));
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2002
                buf.append('$');
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2003
                // The above appended name components may not be unique, append
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2004
                // a count based on the above name components.
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2005
                buf.append(syntheticMethodNameCounts.getIndex(buf));
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2006
                String result = buf.toString();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2007
                //System.err.printf("serializedLambdaName: %s -- %s\n", result, disam);
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2008
                return names.fromString(result);
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2009
            }
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2010
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2011
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2012
             * Translate a symbol of a given kind into something suitable for the
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2013
             * synthetic lambda body
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2014
             */
29772
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2015
            Symbol translate(final Symbol sym, LambdaSymbolKind skind) {
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2016
                Symbol ret;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2017
                switch (skind) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2018
                    case CAPTURED_THIS:
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2019
                        ret = sym;  // self represented
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2020
                        break;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2021
                    case TYPE_VAR:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2022
                        // Just erase the type var
29772
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2023
                        ret = new VarSymbol(sym.flags(), sym.name,
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  2024
                                types.erasure(sym.type), sym.owner);
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19651
diff changeset
  2025
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19651
diff changeset
  2026
                        /* this information should also be kept for LVT generation at Gen
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19651
diff changeset
  2027
                         * a Symbol with pos < startPos won't be tracked.
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19651
diff changeset
  2028
                         */
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19651
diff changeset
  2029
                        ((VarSymbol)ret).pos = ((VarSymbol)sym).pos;
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2030
                        break;
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  2031
                    case CAPTURED_VAR:
29772
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2032
                        ret = new VarSymbol(SYNTHETIC | FINAL | PARAMETER, sym.name, types.erasure(sym.type), translatedSym) {
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  2033
                            @Override
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  2034
                            public Symbol baseSymbol() {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  2035
                                //keep mapping with original captured symbol
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  2036
                                return sym;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  2037
                            }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 16310
diff changeset
  2038
                        };
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2039
                        break;
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2040
                    case CAPTURED_OUTER_THIS:
34568
afc0330fa0d4 8145051: Wrong parameter name in synthetic lambda method leads to verifier error
sadayapalam
parents: 34472
diff changeset
  2041
                        Name name = names.fromString(new String(sym.flatName().toString().replace('.', '$') + names.dollarThis));
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2042
                        ret = new VarSymbol(SYNTHETIC | FINAL | PARAMETER, name, types.erasure(sym.type), translatedSym) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2043
                            @Override
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2044
                            public Symbol baseSymbol() {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2045
                                //keep mapping with original captured symbol
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2046
                                return sym;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2047
                            }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2048
                        };
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2049
                        break;
21477
02dc78554e0c 8026749: Missing LV table in lambda bodies
jjg
parents: 21042
diff changeset
  2050
                    case LOCAL_VAR:
29772
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2051
                        ret = new VarSymbol(sym.flags() & FINAL, sym.name, sym.type, translatedSym);
21477
02dc78554e0c 8026749: Missing LV table in lambda bodies
jjg
parents: 21042
diff changeset
  2052
                        ((VarSymbol) ret).pos = ((VarSymbol) sym).pos;
02dc78554e0c 8026749: Missing LV table in lambda bodies
jjg
parents: 21042
diff changeset
  2053
                        break;
02dc78554e0c 8026749: Missing LV table in lambda bodies
jjg
parents: 21042
diff changeset
  2054
                    case PARAM:
29772
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2055
                        ret = new VarSymbol((sym.flags() & FINAL) | PARAMETER, sym.name, types.erasure(sym.type), translatedSym);
21477
02dc78554e0c 8026749: Missing LV table in lambda bodies
jjg
parents: 21042
diff changeset
  2056
                        ((VarSymbol) ret).pos = ((VarSymbol) sym).pos;
02dc78554e0c 8026749: Missing LV table in lambda bodies
jjg
parents: 21042
diff changeset
  2057
                        break;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2058
                    default:
29772
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2059
                        Assert.error(skind.name());
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2060
                        throw new AssertionError();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2061
                }
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2062
                if (ret != sym) {
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17585
diff changeset
  2063
                    ret.setDeclarationAttributes(sym.getRawAttributes());
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17585
diff changeset
  2064
                    ret.setTypeAttributes(sym.getRawTypeAttributes());
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2065
                }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 17575
diff changeset
  2066
                return ret;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2067
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2068
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2069
            void addSymbol(Symbol sym, LambdaSymbolKind skind) {
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2070
                if (skind == CAPTURED_THIS && sym != null && sym.kind == TYP && !typesUnderConstruction.isEmpty()) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2071
                    ClassSymbol currentClass = currentClass();
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2072
                    if (currentClass != null && typesUnderConstruction.contains(currentClass)) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2073
                        // reference must be to enclosing outer instance, mutate capture kind.
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2074
                        Assert.check(sym != currentClass); // should have been caught right in Attr
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2075
                        skind = CAPTURED_OUTER_THIS;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2076
                    }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2077
                }
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2078
                Map<Symbol, Symbol> transMap = getSymbolMap(skind);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2079
                if (!transMap.containsKey(sym)) {
29772
4e4e74b99d27 8054220: Debugger doesn't show variables *outside* lambda
jlahoda
parents: 29149
diff changeset
  2080
                    transMap.put(sym, translate(sym, skind));
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2081
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2082
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2083
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2084
            Map<Symbol, Symbol> getSymbolMap(LambdaSymbolKind skind) {
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2085
                Map<Symbol, Symbol> m = translatedSymbols.get(skind);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2086
                Assert.checkNonNull(m);
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2087
                return m;
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2088
            }
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2089
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2090
            JCTree translate(JCIdent lambdaIdent) {
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2091
                for (LambdaSymbolKind kind : LambdaSymbolKind.values()) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2092
                    Map<Symbol, Symbol> m = getSymbolMap(kind);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2093
                    switch(kind) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2094
                        default:
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2095
                            if (m.containsKey(lambdaIdent.sym)) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2096
                                Symbol tSym = m.get(lambdaIdent.sym);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2097
                                JCTree t = make.Ident(tSym).setType(lambdaIdent.type);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2098
                                tSym.setTypeAttributes(lambdaIdent.sym.getRawTypeAttributes());
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2099
                                return t;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2100
                            }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2101
                            break;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2102
                        case CAPTURED_OUTER_THIS:
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2103
                            if (lambdaIdent.sym.owner.kind == TYP && m.containsKey(lambdaIdent.sym.owner)) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2104
                                // Transform outer instance variable references anchoring them to the captured synthetic.
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2105
                                Symbol tSym = m.get(lambdaIdent.sym.owner);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2106
                                JCExpression t = make.Ident(tSym).setType(lambdaIdent.sym.owner.type);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2107
                                tSym.setTypeAttributes(lambdaIdent.sym.owner.getRawTypeAttributes());
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2108
                                t = make.Select(t, lambdaIdent.name);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2109
                                t.setType(lambdaIdent.type);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2110
                                TreeInfo.setSymbol(t, lambdaIdent.sym);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2111
                                return t;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2112
                            }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2113
                            break;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2114
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2115
                }
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2116
                return null;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2117
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2118
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2119
            /* Translate away qualified this expressions, anchoring them to synthetic parameters that
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2120
               capture the qualified this handle. `fieldAccess' is guaranteed to one such.
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2121
            */
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2122
            public JCTree translate(JCFieldAccess fieldAccess) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2123
                Assert.check(fieldAccess.name == names._this);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2124
                Map<Symbol, Symbol> m = translatedSymbols.get(LambdaSymbolKind.CAPTURED_OUTER_THIS);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2125
                if (m.containsKey(fieldAccess.sym.owner)) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2126
                    Symbol tSym = m.get(fieldAccess.sym.owner);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2127
                    JCExpression t = make.Ident(tSym).setType(fieldAccess.sym.owner.type);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2128
                    tSym.setTypeAttributes(fieldAccess.sym.owner.getRawTypeAttributes());
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2129
                    return t;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2130
                }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2131
                return null;
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2132
            }
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2133
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2134
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2135
             * The translatedSym is not complete/accurate until the analysis is
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2136
             * finished.  Once the analysis is finished, the translatedSym is
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2137
             * "completed" -- updated with type information, access modifiers,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2138
             * and full parameter list.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2139
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2140
            void complete() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2141
                if (syntheticParams != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2142
                    return;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2143
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2144
                boolean inInterface = translatedSym.owner.isInterface();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2145
                boolean thisReferenced = !getSymbolMap(CAPTURED_THIS).isEmpty();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2146
17575
7693e6ff0d7d 8012556: Implement lambda methods on interfaces as static
rfield
parents: 17550
diff changeset
  2147
                // If instance access isn't needed, make it static.
7693e6ff0d7d 8012556: Implement lambda methods on interfaces as static
rfield
parents: 17550
diff changeset
  2148
                // Interface instance methods must be default methods.
21014
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
  2149
                // Lambda methods are private synthetic.
25278
8a326edaf411 8046060: Different results of floating point multiplication for lambda code block
rfield
parents: 24225
diff changeset
  2150
                // Inherit ACC_STRICT from the enclosing method, or, for clinit,
8a326edaf411 8046060: Different results of floating point multiplication for lambda code block
rfield
parents: 24225
diff changeset
  2151
                // from the class.
21477
02dc78554e0c 8026749: Missing LV table in lambda bodies
jjg
parents: 21042
diff changeset
  2152
                translatedSym.flags_field = SYNTHETIC | LAMBDA_METHOD |
25278
8a326edaf411 8046060: Different results of floating point multiplication for lambda code block
rfield
parents: 24225
diff changeset
  2153
                        owner.flags_field & STRICTFP |
8a326edaf411 8046060: Different results of floating point multiplication for lambda code block
rfield
parents: 24225
diff changeset
  2154
                        owner.owner.flags_field & STRICTFP |
21014
57913337d634 8012557: Implement lambda methods on interfaces as private
rfield
parents: 20249
diff changeset
  2155
                        PRIVATE |
17575
7693e6ff0d7d 8012556: Implement lambda methods on interfaces as static
rfield
parents: 17550
diff changeset
  2156
                        (thisReferenced? (inInterface? DEFAULT : 0) : STATIC);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2157
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2158
                //compute synthetic params
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20245
diff changeset
  2159
                ListBuffer<JCVariableDecl> params = new ListBuffer<>();
28452
6afa05455443 8037546: javac -parameters does not emit parameter names for lambda expressions
jlahoda
parents: 28145
diff changeset
  2160
                ListBuffer<VarSymbol> parameterSymbols = new ListBuffer<>();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2161
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2162
                // The signature of the method is augmented with the following
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2163
                // synthetic parameters:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2164
                //
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2165
                // 1) reference to enclosing contexts captured by the lambda expression
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2166
                // 2) enclosing locals captured by the lambda expression
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2167
                for (Symbol thisSym : getSymbolMap(CAPTURED_VAR).values()) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2168
                    params.append(make.VarDef((VarSymbol) thisSym, null));
28452
6afa05455443 8037546: javac -parameters does not emit parameter names for lambda expressions
jlahoda
parents: 28145
diff changeset
  2169
                    parameterSymbols.append((VarSymbol) thisSym);
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2170
                }
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2171
                for (Symbol thisSym : getSymbolMap(CAPTURED_OUTER_THIS).values()) {
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2172
                    params.append(make.VarDef((VarSymbol) thisSym, null));
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2173
                    parameterSymbols.append((VarSymbol) thisSym);
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2174
                }
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2175
                for (Symbol thisSym : getSymbolMap(PARAM).values()) {
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2176
                    params.append(make.VarDef((VarSymbol) thisSym, null));
28452
6afa05455443 8037546: javac -parameters does not emit parameter names for lambda expressions
jlahoda
parents: 28145
diff changeset
  2177
                    parameterSymbols.append((VarSymbol) thisSym);
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2178
                }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2179
                syntheticParams = params.toList();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2180
28452
6afa05455443 8037546: javac -parameters does not emit parameter names for lambda expressions
jlahoda
parents: 28145
diff changeset
  2181
                translatedSym.params = parameterSymbols.toList();
6afa05455443 8037546: javac -parameters does not emit parameter names for lambda expressions
jlahoda
parents: 28145
diff changeset
  2182
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2183
                // Compute and set the lambda name
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2184
                translatedSym.name = isSerializable()
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2185
                        ? serializedLambdaName()
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2186
                        : lambdaName();
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2187
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2188
                //prepend synthetic args to translated lambda method signature
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2189
                translatedSym.type = types.createMethodTypeWithParameters(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2190
                        generatedLambdaSig(),
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2191
                        TreeInfo.types(syntheticParams));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2192
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2193
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2194
            Type generatedLambdaSig() {
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  2195
                return types.erasure(tree.getDescriptorType(types));
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2196
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2197
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2198
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2199
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2200
         * This class retains all the useful information about a method reference;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2201
         * the contents of this class are filled by the LambdaAnalyzer visitor,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2202
         * and the used by the main translation routines in order to adjust method
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2203
         * references (i.e. in case a bridge is needed)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2204
         */
29149
3fa94aad0264 8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents: 29051
diff changeset
  2205
        final class ReferenceTranslationContext extends TranslationContext<JCMemberReference> {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2206
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2207
            final boolean isSuper;
21892
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2208
            final Symbol sigPolySym;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2209
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2210
            ReferenceTranslationContext(JCMemberReference tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2211
                super(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2212
                this.isSuper = tree.hasKind(ReferenceKind.SUPER);
21892
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2213
                this.sigPolySym = isSignaturePolymorphic()
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2214
                        ? makePrivateSyntheticMethod(tree.sym.flags(),
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2215
                                              tree.sym.name,
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2216
                                              bridgedRefSig(),
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2217
                                              tree.sym.enclClass())
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2218
                        : null;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2219
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2220
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2221
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2222
             * Get the opcode associated with this method reference
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2223
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2224
            int referenceKind() {
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2225
                return LambdaToMethod.this.referenceKind(tree.sym);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2226
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2227
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2228
            boolean needsVarArgsConversion() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2229
                return tree.varargsElement != null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2230
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2231
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2232
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2233
             * @return Is this an array operation like clone()
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2234
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2235
            boolean isArrayOp() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2236
                return tree.sym.owner == syms.arrayClass;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2237
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2238
16328
8b9eb42167f6 8009129: Illegal access error when calling method reference
mcimadamore
parents: 16327
diff changeset
  2239
            boolean receiverAccessible() {
8b9eb42167f6 8009129: Illegal access error when calling method reference
mcimadamore
parents: 16327
diff changeset
  2240
                //hack needed to workaround 292 bug (7087658)
8b9eb42167f6 8009129: Illegal access error when calling method reference
mcimadamore
parents: 16327
diff changeset
  2241
                //when 292 issue is fixed we should remove this and change the backend
8b9eb42167f6 8009129: Illegal access error when calling method reference
mcimadamore
parents: 16327
diff changeset
  2242
                //code to always generate a method handle to an accessible method
8b9eb42167f6 8009129: Illegal access error when calling method reference
mcimadamore
parents: 16327
diff changeset
  2243
                return tree.ownerAccessible;
8b9eb42167f6 8009129: Illegal access error when calling method reference
mcimadamore
parents: 16327
diff changeset
  2244
            }
8b9eb42167f6 8009129: Illegal access error when calling method reference
mcimadamore
parents: 16327
diff changeset
  2245
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2246
            /**
21493
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2247
             * The VM does not support access across nested classes (8010319).
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2248
             * Were that ever to change, this should be removed.
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2249
             */
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2250
            boolean isPrivateInOtherClass() {
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2251
                return  (tree.sym.flags() & PRIVATE) != 0 &&
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2252
                        !types.isSameType(
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2253
                              types.erasure(tree.sym.enclClass().asType()),
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2254
                              types.erasure(owner.enclClass().asType()));
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2255
            }
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2256
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2257
            /**
21892
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2258
             * Signature polymorphic methods need special handling.
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2259
             * e.g. MethodHandle.invoke() MethodHandle.invokeExact()
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2260
             */
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2261
            final boolean isSignaturePolymorphic() {
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2262
                return  tree.sym.kind == MTH &&
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2263
                        types.isSignaturePolymorphic((MethodSymbol)tree.sym);
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2264
            }
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2265
8ab5aa58a900 8028739: javac generates incorrect descriptor for MethodHandle::invoke
rfield
parents: 21496
diff changeset
  2266
            /**
27855
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2267
             * Erasure destroys the implementation parameter subtype
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2268
             * relationship for intersection types
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2269
             */
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2270
            boolean interfaceParameterIsIntersectionType() {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2271
                List<Type> tl = tree.getDescriptorType(types).getParameterTypes();
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2272
                for (; tl.nonEmpty(); tl = tl.tail) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2273
                    Type pt = tl.head;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2274
                    if (pt.getKind() == TypeKind.TYPEVAR) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2275
                        TypeVar tv = (TypeVar) pt;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2276
                        if (tv.bound.getKind() == TypeKind.INTERSECTION) {
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2277
                            return true;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2278
                        }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2279
                    }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2280
                }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2281
                return false;
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2282
            }
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2283
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2284
            /**
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2285
             * Does this reference need to be converted to a lambda
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2286
             * (i.e. var args need to be expanded or "super" is used)
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2287
             */
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2288
            final boolean needsConversionToLambda() {
27855
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2289
                return interfaceParameterIsIntersectionType() ||
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2290
                        isSuper ||
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2291
                        needsVarArgsConversion() ||
7afea3897f9b 8058112: Invalid BootstrapMethod for constructor/method reference
rfield
parents: 27224
diff changeset
  2292
                        isArrayOp() ||
21493
d3f44b144a76 8022720: Method refeerences - private method should be accessible (nested classes)
rfield
parents: 21492
diff changeset
  2293
                        isPrivateInOtherClass() ||
25281
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2294
                        !receiverAccessible() ||
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2295
                        (tree.getMode() == ReferenceMode.NEW &&
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2296
                          tree.kind != ReferenceKind.ARRAY_CTOR &&
0babd05cbcd3 8037404: javac NPE or VerifyError for code with constructor reference of inner class
rfield
parents: 25278
diff changeset
  2297
                          (tree.sym.owner.isLocal() || tree.sym.owner.isInner()));
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2298
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2299
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2300
            Type generatedRefSig() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2301
                return types.erasure(tree.sym.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2302
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2303
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2304
            Type bridgedRefSig() {
18730
95354d510139 8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
mcimadamore
parents: 18412
diff changeset
  2305
                return types.erasure(types.findDescriptorSymbol(tree.targets.head.tsym).type);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2306
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2307
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2308
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2309
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2310
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2311
    /*
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2312
     * These keys provide mappings for various translated lambda symbols
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2313
     * and the prevailing order must be maintained.
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2314
     */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2315
    enum LambdaSymbolKind {
21486
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2316
        PARAM,          // original to translated lambda parameters
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2317
        LOCAL_VAR,      // original to translated lambda locals
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2318
        CAPTURED_VAR,   // variables in enclosing scope to translated synthetic parameters
847de793f27a 8026758: Inefficient code in LambdaToMethod
ksrini
parents: 21477
diff changeset
  2319
        CAPTURED_THIS,  // class symbols to translated synthetic parameters (for captured member access)
33706
0d21ecb55e6a 8129740: Incorrect class file created when passing lambda in inner class constructor
sadayapalam
parents: 31296
diff changeset
  2320
        CAPTURED_OUTER_THIS, // used when `this' capture is illegal, but outer this capture is legit (JDK-8129740)
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22162
diff changeset
  2321
        TYPE_VAR       // original to translated lambda type variables
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2322
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2323
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2324
    /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2325
     * ****************************************************************
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2326
     * Signature Generation
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2327
     * ****************************************************************
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2328
     */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2329
21489
018e34d4045f 8023668: Desugar serializable lambda bodies using more robust naming scheme
rfield
parents: 21486
diff changeset
  2330
    private String typeSig(Type type) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2331
        L2MSignatureGenerator sg = new L2MSignatureGenerator();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2332
        sg.assembleSig(type);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2333
        return sg.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2334
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2335
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2336
    private String classSig(Type type) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2337
        L2MSignatureGenerator sg = new L2MSignatureGenerator();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2338
        sg.assembleClassSig(type);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2339
        return sg.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2340
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2341
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2342
    /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2343
     * Signature Generation
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2344
     */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2345
    private class L2MSignatureGenerator extends Types.SignatureGenerator {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2346
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2347
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2348
         * An output buffer for type signatures.
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2349
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2350
        StringBuilder sb = new StringBuilder();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2351
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2352
        L2MSignatureGenerator() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2353
            super(types);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2354
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2355
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2356
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2357
        protected void append(char ch) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2358
            sb.append(ch);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2359
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2360
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2361
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2362
        protected void append(byte[] ba) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2363
            sb.append(new String(ba));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2364
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2365
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2366
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2367
        protected void append(Name name) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2368
            sb.append(name.toString());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2369
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2370
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2371
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2372
        public String toString() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2373
            return sb.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  2374
        }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2375
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  2376
}