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