langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
author mcimadamore
Thu, 21 Feb 2013 15:19:29 +0000
changeset 16308 a0658c36f717
parent 16300 7cf27559c8df
child 16310 af1565438e63
permissions -rw-r--r--
8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler Summary: Disentangle cyclic dependency between static-ness of synthetic lambda method and static-ness of classes nested within lambdas Reviewed-by: jjg
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
/*
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
     2
 * Copyright (c) 2010, 2013, 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
 */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    25
package com.sun.tools.javac.comp;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    26
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    27
import com.sun.tools.javac.tree.*;
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.JCTree;
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.TreeScanner;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    33
import com.sun.tools.javac.tree.TreeTranslator;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    34
import com.sun.tools.javac.code.Kinds;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    35
import com.sun.tools.javac.code.Scope;
14365
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;
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.ClassSymbol;
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.DynamicMethodSymbol;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    39
import com.sun.tools.javac.code.Symbol.MethodSymbol;
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.ClassType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    44
import com.sun.tools.javac.code.Type.MethodType;
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;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    46
import com.sun.tools.javac.comp.LambdaToMethod.LambdaAnalyzer.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    47
import com.sun.tools.javac.jvm.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    48
import com.sun.tools.javac.util.*;
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.List;
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    53
import java.util.HashMap;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    54
import java.util.LinkedHashMap;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    55
import java.util.Map;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    56
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    57
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
    58
import static com.sun.tools.javac.code.Flags.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    59
import static com.sun.tools.javac.code.Kinds.*;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    60
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
    61
import static com.sun.tools.javac.tree.JCTree.Tag.*;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    62
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    63
/**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    64
 * 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
    65
 *
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    66
 *  <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
    67
 *  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
    68
 *  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
    69
 *  deletion without notice.</b>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    70
 */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    71
public class LambdaToMethod extends TreeTranslator {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    72
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    73
    private Names names;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    74
    private Symtab syms;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    75
    private Resolve rs;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    76
    private TreeMaker make;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    77
    private Types types;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    78
    private TransTypes transTypes;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    79
    private Env<AttrContext> attrEnv;
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
    /** the analyzer scanner */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    82
    private LambdaAnalyzer analyzer;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    83
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    84
    /** 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
    85
    private Map<JCTree, TranslationContext<?>> contextMap;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    86
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    87
    /** current translation context (visitor argument) */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    88
    private TranslationContext<?> context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
    89
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    90
    /** info about the current class being processed */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    91
    private KlassInfo kInfo;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    92
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    93
    /** Flag for alternate metafactories indicating the lambda object is intended to be serializable */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    94
    public static final int FLAG_SERIALIZABLE = 1 << 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    95
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    96
    /** Flag for alternate metafactories indicating the lambda object has multiple targets */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    97
    public static final int FLAG_MARKERS = 1 << 1;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    98
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
    99
    private class KlassInfo {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   100
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   101
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   102
         * list of methods to append
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   103
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   104
        private ListBuffer<JCTree> appendedMethodList;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   105
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   106
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   107
         * list of deserialization cases
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   108
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   109
        private final Map<String, ListBuffer<JCStatement>> deserializeCases;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   110
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   111
       /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   112
         * deserialize method symbol
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   113
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   114
        private final MethodSymbol deserMethodSym;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   115
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   116
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   117
         * deserialize method parameter symbol
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   118
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   119
        private final VarSymbol deserParamSym;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   120
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   121
        private KlassInfo(Symbol kSym) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   122
            appendedMethodList = ListBuffer.lb();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   123
            deserializeCases = new HashMap<String, ListBuffer<JCStatement>>();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   124
            long flags = PRIVATE | STATIC | SYNTHETIC;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   125
            MethodType type = new MethodType(List.of(syms.serializedLambdaType), syms.objectType,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   126
                    List.<Type>nil(), syms.methodClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   127
            deserMethodSym = makeSyntheticMethod(flags, names.deserializeLambda, type, kSym);
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   128
            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
   129
                    syms.serializedLambdaType, deserMethodSym);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   130
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   131
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   132
        private void addMethod(JCTree decl) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   133
            appendedMethodList = appendedMethodList.prepend(decl);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   134
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   135
    }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   136
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   137
    // <editor-fold defaultstate="collapsed" desc="Instantiating">
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   138
    private static final Context.Key<LambdaToMethod> unlambdaKey =
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   139
            new Context.Key<LambdaToMethod>();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   140
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   141
    public static LambdaToMethod instance(Context context) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   142
        LambdaToMethod instance = context.get(unlambdaKey);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   143
        if (instance == null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   144
            instance = new LambdaToMethod(context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   145
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   146
        return instance;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   147
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   148
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   149
    private LambdaToMethod(Context context) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   150
        names = Names.instance(context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   151
        syms = Symtab.instance(context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   152
        rs = Resolve.instance(context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   153
        make = TreeMaker.instance(context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   154
        types = Types.instance(context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   155
        transTypes = TransTypes.instance(context);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   156
        analyzer = new LambdaAnalyzer();
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   157
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   158
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   159
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   160
    // <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
   161
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   162
    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
   163
        TranslationContext<?> newContext = contextMap.get(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   164
        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
   165
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   166
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   167
    public <T extends JCTree> T translate(T tree, TranslationContext<?> newContext) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   168
        TranslationContext<?> prevContext = context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   169
        try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   170
            context = newContext;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   171
            return super.translate(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   172
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   173
        finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   174
            context = prevContext;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   175
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   176
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   177
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   178
    public <T extends JCTree> List<T> translate(List<T> trees, TranslationContext<?> newContext) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   179
        ListBuffer<T> buf = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   180
        for (T tree : trees) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   181
            buf.append(translate(tree, newContext));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   182
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   183
        return buf.toList();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   184
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   185
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   186
    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
   187
        this.make = make;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   188
        this.attrEnv = env;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   189
        this.context = null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   190
        this.contextMap = new HashMap<JCTree, TranslationContext<?>>();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   191
        return translate(cdef);
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>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   194
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   195
    // <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
   196
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   197
     * Visit a class.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   198
     * Maintain the translatedMethodList across nested classes.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   199
     * 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
   200
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   201
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   202
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   203
    public void visitClassDef(JCClassDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   204
        if (tree.sym.owner.kind == PCK) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   205
            //analyze class
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   206
            analyzer.analyzeClass(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   207
        }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   208
        KlassInfo prevKlassInfo = kInfo;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   209
        try {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   210
            kInfo = new KlassInfo(tree.sym);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   211
            super.visitClassDef(tree);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   212
            if (!kInfo.deserializeCases.isEmpty()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   213
                kInfo.addMethod(makeDeserializeMethod(tree.sym));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   214
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   215
            //add all translated instance methods here
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   216
            List<JCTree> newMethods = kInfo.appendedMethodList.toList();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   217
            tree.defs = tree.defs.appendList(newMethods);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   218
            for (JCTree lambda : newMethods) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   219
                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
   220
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   221
            result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   222
        } finally {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   223
            kInfo = prevKlassInfo;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   224
        }
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
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
     * 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
   229
     * 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
   230
     * 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
   231
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   232
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   233
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   234
    public void visitLambda(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   235
        LambdaTranslationContext localContext = (LambdaTranslationContext)context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   236
        MethodSymbol sym = (MethodSymbol)localContext.translatedSym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   237
        MethodType lambdaType = (MethodType) sym.type;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   238
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   239
        //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
   240
        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
   241
                sym.name,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   242
                make.QualIdent(lambdaType.getReturnType().tsym),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   243
                List.<JCTypeParameter>nil(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   244
                localContext.syntheticParams,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   245
                lambdaType.getThrownTypes() == null ?
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   246
                    List.<JCExpression>nil() :
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   247
                    make.Types(lambdaType.getThrownTypes()),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   248
                null,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   249
                null);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   250
        lambdaDecl.sym = sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   251
        lambdaDecl.type = lambdaType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   252
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   253
        //translate lambda body
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   254
        //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
   255
        //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
   256
        //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
   257
        //captured members directly).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   258
        lambdaDecl.body = translate(makeLambdaBody(tree, lambdaDecl));
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
        //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
   261
        kInfo.addMethod(lambdaDecl);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   262
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   263
        //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
   264
        //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
   265
        //created method.
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
        //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
   268
        //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
   269
        //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
   270
        //
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   271
        // * 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
   272
        // * 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
   273
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   274
        ListBuffer<JCExpression> syntheticInits = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   275
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   276
        if (!sym.isStatic()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   277
            syntheticInits.append(makeThis(
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   278
                    sym.owner.enclClass().asType(),
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   279
                    localContext.owner.enclClass()));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   280
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   281
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   282
        //add captured locals
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   283
        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
   284
            if (fv != localContext.self) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   285
                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
   286
                syntheticInits.append((JCExpression) captured_local);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   287
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   288
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   289
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   290
        //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
   291
        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
   292
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   293
        //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
   294
        int refKind = referenceKind(sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   295
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   296
        //convert to an invokedynamic call
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   297
        result = makeMetaFactoryIndyCall(tree, context.needsAltMetafactory(), context.isSerializable(), refKind, sym, indy_args);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   298
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   299
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   300
    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
   301
        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
   302
                names._this,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   303
                type,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   304
                owner);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   305
        return make.Ident(_this);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   306
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   307
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   308
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   309
     * 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
   310
     * meta-factory.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   311
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   312
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   313
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   314
    public void visitReference(JCMemberReference tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   315
        ReferenceTranslationContext localContext = (ReferenceTranslationContext)context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   316
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   317
        //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
   318
        //this is either the method reference symbol, or the bridged reference symbol
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   319
        Symbol refSym = localContext.needsBridge() ?
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   320
            localContext.bridgeSym :
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   321
            tree.sym;
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
        //build the bridge method, if needed
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   324
        if (localContext.needsBridge()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   325
            bridgeMemberReference(tree, localContext);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   326
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   327
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   328
        //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
   329
        JCExpression init;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   330
        switch(tree.kind) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   331
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   332
            case IMPLICIT_INNER:    /** Inner :: new */
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   333
            case SUPER:             /** super :: instMethod */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   334
                init = makeThis(
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   335
                    localContext.owner.enclClass().asType(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   336
                    localContext.owner.enclClass());
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   337
                break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   338
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   339
            case BOUND:             /** Expr :: instMethod */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   340
                init = tree.getQualifierExpression();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   341
                break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   342
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   343
            case UNBOUND:           /** Type :: instMethod */
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   344
            case STATIC:            /** Type :: staticMethod */
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14537
diff changeset
   345
            case TOPLEVEL:          /** Top level :: new */
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   346
            case ARRAY_CTOR:        /** ArrayType :: new */
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   347
                init = null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   348
                break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   349
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   350
            default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   351
                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
   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
        List<JCExpression> indy_args = init==null? List.<JCExpression>nil() : translate(List.of(init), localContext.prev);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   355
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   356
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   357
        //build a sam instance using an indy call to the meta-factory
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   358
        result = makeMetaFactoryIndyCall(tree, localContext.needsAltMetafactory(), localContext.isSerializable(), localContext.referenceKind(), refSym, indy_args);
14365
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   361
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   362
     * 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
   363
     * @param tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   364
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   365
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   366
    public void visitIdent(JCIdent tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   367
        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
   368
            super.visitIdent(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   369
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   370
            LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   371
            if (lambdaContext.getSymbolMap(PARAM).containsKey(tree.sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   372
                Symbol translatedSym = lambdaContext.getSymbolMap(PARAM).get(tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   373
                result = make.Ident(translatedSym).setType(tree.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   374
            } else if (lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   375
                Symbol translatedSym = lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   376
                result = make.Ident(translatedSym).setType(tree.type);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   377
            } else if (lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   378
                Symbol translatedSym = lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   379
                result = make.Ident(translatedSym).setType(translatedSym.type);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   380
            } else if (lambdaContext.getSymbolMap(CAPTURED_VAR).containsKey(tree.sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   381
                Symbol translatedSym = lambdaContext.getSymbolMap(CAPTURED_VAR).get(tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   382
                result = make.Ident(translatedSym).setType(tree.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   383
            } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   384
                if (tree.sym.owner.kind == Kinds.TYP) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   385
                    for (Map.Entry<Symbol, Symbol> encl_entry : lambdaContext.getSymbolMap(CAPTURED_THIS).entrySet()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   386
                        if (tree.sym.isMemberOf((ClassSymbol) encl_entry.getKey(), types)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   387
                            JCExpression enclRef = make.Ident(encl_entry.getValue());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   388
                            result = tree.sym.name == names._this
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   389
                                    ? enclRef.setType(tree.type)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   390
                                    : make.Select(enclRef, tree.sym).setType(tree.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   391
                            result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   392
                            return;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   393
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   394
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   395
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   396
                //access to untranslated symbols (i.e. compile-time constants,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   397
                //members defined inside the lambda body, etc.) )
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   398
                super.visitIdent(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   399
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   400
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   401
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   402
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   403
    @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   404
    public void visitVarDef(JCVariableDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   405
        LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   406
        if (context != null && lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   407
            JCExpression init = translate(tree.init);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   408
            result = make.VarDef((VarSymbol)lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym), init);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   409
        } else if (context != null && lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   410
            JCExpression init = translate(tree.init);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   411
            VarSymbol xsym = (VarSymbol)lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   412
            result = make.VarDef(xsym, init);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   413
            // Replace the entered symbol for this variable
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   414
            Scope sc = tree.sym.owner.members();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   415
            if (sc != null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   416
                sc.remove(tree.sym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   417
                sc.enter(xsym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   418
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   419
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   420
            super.visitVarDef(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   421
        }
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   424
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   425
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   426
    // <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
   427
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   428
    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
   429
        return tree.getBodyKind() == JCLambda.BodyKind.EXPRESSION ?
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   430
                makeLambdaExpressionBody((JCExpression)tree.body, lambdaMethodDecl) :
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   431
                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
   432
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   433
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   434
    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
   435
        Type restype = lambdaMethodDecl.type.getReturnType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   436
        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
   437
        boolean isTarget_void = restype.hasTag(VOID);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   438
        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
   439
        if (isTarget_void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   440
            //target is void:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   441
            // BODY;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   442
            JCStatement stat = make.Exec(expr);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   443
            return make.Block(0, List.<JCStatement>of(stat));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   444
        } else if (isLambda_void && isTarget_Void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   445
            //void to Void conversion:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   446
            // BODY; return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   447
            ListBuffer<JCStatement> stats = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   448
            stats.append(make.Exec(expr));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   449
            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
   450
            return make.Block(0, stats.toList());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   451
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   452
            //non-void to non-void conversion:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   453
            // return (TYPE)BODY;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   454
            JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   455
            return make.Block(0, List.<JCStatement>of(make.Return(retExpr)));
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   459
    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
   460
        final Type restype = lambdaMethodDecl.type.getReturnType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   461
        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
   462
        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
   463
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   464
        class LambdaBodyTranslator extends TreeTranslator {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   465
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   466
            @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   467
            public void visitClassDef(JCClassDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   468
                //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
   469
                result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   470
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   471
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   472
            @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   473
            public void visitLambda(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   474
                //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
   475
                result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   476
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   477
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   478
            @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   479
            public void visitReturn(JCReturn tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   480
                boolean isLambda_void = tree.expr == null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   481
                if (isTarget_void && !isLambda_void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   482
                    //Void to void conversion:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   483
                    // { TYPE $loc = RET-EXPR; return; }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   484
                    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
   485
                    JCVariableDecl varDef = make.VarDef(loc, tree.expr);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   486
                    result = make.Block(0, List.<JCStatement>of(varDef, make.Return(null)));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   487
                } else if (!isTarget_void || !isLambda_void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   488
                    //non-void to non-void conversion:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   489
                    // return (TYPE)RET-EXPR;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   490
                    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
   491
                    result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   492
                } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   493
                    result = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   494
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   495
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   496
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   497
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   498
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   499
        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
   500
        if (completeNormally && isTarget_Void) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   501
            //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
   502
            //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
   503
            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
   504
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   505
        return trans_block;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   506
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   507
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   508
    private JCMethodDecl makeDeserializeMethod(Symbol kSym) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   509
        ListBuffer<JCCase> cases = ListBuffer.lb();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   510
        ListBuffer<JCBreak> breaks = ListBuffer.lb();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   511
        for (Map.Entry<String, ListBuffer<JCStatement>> entry : kInfo.deserializeCases.entrySet()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   512
            JCBreak br = make.Break(null);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   513
            breaks.add(br);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   514
            List<JCStatement> stmts = entry.getValue().append(br).toList();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   515
            cases.add(make.Case(make.Literal(entry.getKey()), stmts));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   516
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   517
        JCSwitch sw = make.Switch(deserGetter("getImplMethodName", syms.stringType), cases.toList());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   518
        for (JCBreak br : breaks) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   519
            br.target = sw;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   520
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   521
        JCBlock body = make.Block(0L, List.<JCStatement>of(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   522
                sw,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   523
                make.Throw(makeNewClass(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   524
                    syms.illegalArgumentExceptionType,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   525
                    List.<JCExpression>of(make.Literal("Invalid lambda deserialization"))))));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   526
        JCMethodDecl deser = make.MethodDef(make.Modifiers(kInfo.deserMethodSym.flags()),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   527
                        names.deserializeLambda,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   528
                        make.QualIdent(kInfo.deserMethodSym.getReturnType().tsym),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   529
                        List.<JCTypeParameter>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   530
                        List.of(make.VarDef(kInfo.deserParamSym, null)),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   531
                        List.<JCExpression>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   532
                        body,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   533
                        null);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   534
        deser.sym = kInfo.deserMethodSym;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   535
        deser.type = kInfo.deserMethodSym.type;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   536
        //System.err.printf("DESER: '%s'\n", deser);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   537
        return deser;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   538
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   539
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   540
    /** Make an attributed class instance creation expression.
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   541
     *  @param ctype    The class type.
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   542
     *  @param args     The constructor arguments.
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   543
     */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   544
    JCNewClass makeNewClass(Type ctype, List<JCExpression> args) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   545
        JCNewClass tree = make.NewClass(null,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   546
            null, make.QualIdent(ctype.tsym), args, null);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   547
        tree.constructor = rs.resolveConstructor(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   548
            null, attrEnv, ctype, TreeInfo.types(args), List.<Type>nil());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   549
        tree.type = ctype;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   550
        return tree;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   551
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   552
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   553
    private void addDeserializationCase(int implMethodKind, Symbol refSym, Type targetType, MethodSymbol samSym,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   554
            DiagnosticPosition pos, List<Object> staticArgs, MethodType indyType) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   555
        String functionalInterfaceClass = classSig(targetType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   556
        String functionalInterfaceMethodName = samSym.getSimpleName().toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   557
        String functionalInterfaceMethodSignature = methodSig(types.erasure(samSym.type));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   558
        String implClass = classSig(refSym.owner.type);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   559
        String implMethodName = refSym.getQualifiedName().toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   560
        String implMethodSignature = methodSig(types.erasure(refSym.type));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   561
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   562
        JCExpression kindTest = eqTest(syms.intType, deserGetter("getImplMethodKind", syms.intType), make.Literal(implMethodKind));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   563
        ListBuffer<JCExpression> serArgs = ListBuffer.lb();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   564
        int i = 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   565
        for (Type t : indyType.getParameterTypes()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   566
            List<JCExpression> indexAsArg = ListBuffer.<JCExpression>lb().append(make.Literal(i)).toList();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   567
            List<Type> argTypes = ListBuffer.<Type>lb().append(syms.intType).toList();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   568
            serArgs.add(make.TypeCast(types.erasure(t), deserGetter("getCapturedArg", syms.objectType, argTypes, indexAsArg)));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   569
            ++i;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   570
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   571
        JCStatement stmt = make.If(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   572
                deserTest(deserTest(deserTest(deserTest(deserTest(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   573
                    kindTest,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   574
                    "getFunctionalInterfaceClass", functionalInterfaceClass),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   575
                    "getFunctionalInterfaceMethodName", functionalInterfaceMethodName),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   576
                    "getFunctionalInterfaceMethodSignature", functionalInterfaceMethodSignature),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   577
                    "getImplClass", implClass),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   578
                    "getImplMethodSignature", implMethodSignature),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   579
                make.Return(makeIndyCall(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   580
                    pos,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   581
                    syms.lambdaMetafactory,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   582
                    names.altMetaFactory,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   583
                    staticArgs, indyType, serArgs.toList())),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   584
                null);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   585
        ListBuffer<JCStatement> stmts = kInfo.deserializeCases.get(implMethodName);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   586
        if (stmts == null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   587
            stmts = ListBuffer.lb();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   588
            kInfo.deserializeCases.put(implMethodName, stmts);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   589
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   590
        /****
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   591
        System.err.printf("+++++++++++++++++\n");
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   592
        System.err.printf("*functionalInterfaceClass: '%s'\n", functionalInterfaceClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   593
        System.err.printf("*functionalInterfaceMethodName: '%s'\n", functionalInterfaceMethodName);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   594
        System.err.printf("*functionalInterfaceMethodSignature: '%s'\n", functionalInterfaceMethodSignature);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   595
        System.err.printf("*implMethodKind: %d\n", implMethodKind);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   596
        System.err.printf("*implClass: '%s'\n", implClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   597
        System.err.printf("*implMethodName: '%s'\n", implMethodName);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   598
        System.err.printf("*implMethodSignature: '%s'\n", implMethodSignature);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   599
        ****/
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   600
        stmts.append(stmt);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   601
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   602
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   603
    private JCExpression eqTest(Type argType, JCExpression arg1, JCExpression arg2) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   604
        JCBinary testExpr = make.Binary(JCTree.Tag.EQ, arg1, arg2);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   605
        testExpr.operator = rs.resolveBinaryOperator(null, JCTree.Tag.EQ, attrEnv, argType, argType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   606
        testExpr.setType(syms.booleanType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   607
        return testExpr;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   608
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   609
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   610
    private JCExpression deserTest(JCExpression prev, String func, String lit) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   611
        MethodType eqmt = new MethodType(List.of(syms.objectType), syms.booleanType, List.<Type>nil(), syms.methodClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   612
        Symbol eqsym = rs.resolveQualifiedMethod(null, attrEnv, syms.objectType, names.equals, List.of(syms.objectType), List.<Type>nil());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   613
        JCMethodInvocation eqtest = make.Apply(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   614
                List.<JCExpression>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   615
                make.Select(deserGetter(func, syms.stringType), eqsym).setType(eqmt),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   616
                List.<JCExpression>of(make.Literal(lit)));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   617
        eqtest.setType(syms.booleanType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   618
        JCBinary compound = make.Binary(JCTree.Tag.AND, prev, eqtest);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   619
        compound.operator = rs.resolveBinaryOperator(null, JCTree.Tag.AND, attrEnv, syms.booleanType, syms.booleanType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   620
        compound.setType(syms.booleanType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   621
        return compound;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   622
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   623
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   624
    private JCExpression deserGetter(String func, Type type) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   625
        return deserGetter(func, type, List.<Type>nil(), List.<JCExpression>nil());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   626
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   627
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   628
    private JCExpression deserGetter(String func, Type type, List<Type> argTypes, List<JCExpression> args) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   629
        MethodType getmt = new MethodType(argTypes, type, List.<Type>nil(), syms.methodClass);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   630
        Symbol getsym = rs.resolveQualifiedMethod(null, attrEnv, syms.serializedLambdaType, names.fromString(func), argTypes, List.<Type>nil());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   631
        return make.Apply(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   632
                    List.<JCExpression>nil(),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   633
                    make.Select(make.Ident(kInfo.deserParamSym).setType(syms.serializedLambdaType), getsym).setType(getmt),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   634
                    args).setType(type);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   635
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   636
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   637
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   638
     * 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
   639
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   640
    private MethodSymbol makeSyntheticMethod(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
   641
        return new MethodSymbol(flags | SYNTHETIC, name, type, owner);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   642
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   643
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   644
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   645
     * 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
   646
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   647
    private VarSymbol makeSyntheticVar(long flags, String name, Type type, Symbol owner) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   648
        return makeSyntheticVar(flags, names.fromString(name), type, owner);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   649
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   650
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   651
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   652
     * 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
   653
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   654
    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
   655
        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
   656
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   657
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   658
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   659
     * 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
   660
     * or a method call tree)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   661
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   662
    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
   663
        if (varargsElement != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   664
            switch (tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   665
                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
   666
                case NEWCLASS: ((JCNewClass)tree).varargsElement = varargsElement; break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   667
                default: throw new AssertionError();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   668
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   669
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   670
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   671
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   672
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   673
     * 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
   674
     * 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
   675
     * 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
   676
     * with the generated signature.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   677
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   678
    private List<JCExpression> convertArgs(Symbol meth, List<JCExpression> args, Type varargsElement) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   679
       Assert.check(meth.kind == Kinds.MTH);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   680
       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
   681
       if (varargsElement != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   682
           Assert.check((meth.flags() & VARARGS) != 0);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   683
       }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   684
       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
   685
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   686
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   687
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   688
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   689
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   690
     * Generate an adapter method "bridge" for a method reference which cannot
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   691
     * be used directly.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   692
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   693
    private class MemberReferenceBridger {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   694
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   695
        private final JCMemberReference tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   696
        private final ReferenceTranslationContext localContext;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   697
        private final ListBuffer<JCExpression> args = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   698
        private final ListBuffer<JCVariableDecl> params = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   699
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   700
        MemberReferenceBridger(JCMemberReference tree, ReferenceTranslationContext localContext) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   701
            this.tree = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   702
            this.localContext = localContext;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   703
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   704
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   705
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   706
         * Generate the bridge
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   707
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   708
        JCMethodDecl bridge() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   709
            int prevPos = make.pos;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   710
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   711
                make.at(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   712
                Type samDesc = localContext.bridgedRefSig();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   713
                List<Type> samPTypes = samDesc.getParameterTypes();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   714
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   715
                //an extra argument is prepended to the signature of the bridge in case
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   716
                //the member reference is an instance method reference (in which case
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   717
                //the receiver expression is passed to the bridge itself).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   718
                Type recType = null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   719
                switch (tree.kind) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   720
                    case IMPLICIT_INNER:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   721
                        recType = tree.sym.owner.type.getEnclosingType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   722
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   723
                    case BOUND:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   724
                        recType = tree.getQualifierExpression().type;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   725
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   726
                    case UNBOUND:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   727
                        recType = samPTypes.head;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   728
                        samPTypes = samPTypes.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   729
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   730
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   731
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   732
                //generate the parameter list for the bridged member reference - the
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   733
                //bridge signature will match the signature of the target sam descriptor
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   734
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   735
                VarSymbol rcvr = (recType == null)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   736
                        ? null
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   737
                        : addParameter("rec$", recType, false);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   738
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   739
                List<Type> refPTypes = tree.sym.type.getParameterTypes();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   740
                int refSize = refPTypes.size();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   741
                int samSize = samPTypes.size();
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   742
                // Last parameter to copy from referenced method
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   743
                int last = localContext.needsVarArgsConversion() ? refSize - 1 : refSize;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   744
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   745
                List<Type> l = refPTypes;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   746
                // Use parameter types of the referenced method, excluding final var args
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   747
                for (int i = 0; l.nonEmpty() && i < last; ++i) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   748
                    addParameter("x$" + i, l.head, true);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   749
                    l = l.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   750
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   751
                // Flatten out the var args
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   752
                for (int i = last; i < samSize; ++i) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   753
                    addParameter("xva$" + i, tree.varargsElement, true);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   754
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   755
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   756
                //generate the bridge method declaration
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   757
                JCMethodDecl bridgeDecl = make.MethodDef(make.Modifiers(localContext.bridgeSym.flags()),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   758
                        localContext.bridgeSym.name,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   759
                        make.QualIdent(samDesc.getReturnType().tsym),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   760
                        List.<JCTypeParameter>nil(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   761
                        params.toList(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   762
                        tree.sym.type.getThrownTypes() == null
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   763
                        ? List.<JCExpression>nil()
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   764
                        : make.Types(tree.sym.type.getThrownTypes()),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   765
                        null,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   766
                        null);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   767
                bridgeDecl.sym = (MethodSymbol) localContext.bridgeSym;
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   768
                bridgeDecl.type = localContext.bridgeSym.type =
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   769
                        types.createMethodTypeWithParameters(samDesc, TreeInfo.types(params.toList()));
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
                //bridge method body generation - this can be either a method call or a
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   772
                //new instance creation expression, depending on the member reference kind
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   773
                JCExpression bridgeExpr = (tree.getMode() == ReferenceMode.INVOKE)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   774
                        ? bridgeExpressionInvoke(rcvr)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   775
                        : bridgeExpressionNew();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   776
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   777
                //the body is either a return expression containing a method call,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   778
                //or the method call itself, depending on whether the return type of
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   779
                //the bridge is non-void/void.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   780
                bridgeDecl.body = makeLambdaExpressionBody(bridgeExpr, bridgeDecl);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   781
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   782
                return bridgeDecl;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   783
            } finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   784
                make.at(prevPos);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   785
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   786
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   787
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   788
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   789
         * determine the receiver of the bridged method call - the receiver can
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   790
         * be either the synthetic receiver parameter or a type qualifier; the
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   791
         * original qualifier expression is never used here, as it might refer
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   792
         * to symbols not available in the static context of the bridge
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
        private JCExpression bridgeExpressionInvoke(VarSymbol rcvr) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   795
            JCExpression qualifier =
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   796
                    tree.sym.isStatic() ?
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   797
                        make.Type(tree.sym.owner.type) :
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   798
                        (rcvr != null) ?
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   799
                            make.Ident(rcvr) :
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   800
                            tree.getQualifierExpression();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   801
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   802
            //create the qualifier expression
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   803
            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
   804
            select.sym = tree.sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   805
            select.type = tree.sym.erasure(types);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   806
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   807
            //create the method call expression
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   808
            JCExpression apply = make.Apply(List.<JCExpression>nil(), select,
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   809
                    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
   810
                    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
   811
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   812
            apply = transTypes.coerce(apply, localContext.generatedRefSig().getReturnType());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   813
            setVarargsIfNeeded(apply, tree.varargsElement);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   814
            return apply;
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   817
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   818
         * the enclosing expression is either 'null' (no enclosing type) or set
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   819
         * to the first bridge synthetic parameter
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   820
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   821
        private JCExpression bridgeExpressionNew() {
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   822
            if (tree.kind == ReferenceKind.ARRAY_CTOR) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   823
                //create the array creation expression
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   824
                JCNewArray newArr = make.NewArray(
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   825
                        make.Type(types.elemtype(tree.getQualifierExpression().type)),
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   826
                        List.of(make.Ident(params.first())),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   827
                        null);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   828
                newArr.type = tree.getQualifierExpression().type;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   829
                return newArr;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   830
            } else {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   831
                JCExpression encl = null;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   832
                switch (tree.kind) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   833
                    case UNBOUND:
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   834
                    case IMPLICIT_INNER:
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   835
                        encl = make.Ident(params.first());
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   836
                }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   837
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   838
                //create the instance creation expression
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   839
                JCNewClass newClass = make.NewClass(encl,
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   840
                        List.<JCExpression>nil(),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   841
                        make.Type(tree.getQualifierExpression().type),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   842
                        convertArgs(tree.sym, args.toList(), tree.varargsElement),
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   843
                        null);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   844
                newClass.constructor = tree.sym;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   845
                newClass.constructorType = tree.sym.erasure(types);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   846
                newClass.type = tree.getQualifierExpression().type;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   847
                setVarargsIfNeeded(newClass, tree.varargsElement);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   848
                return newClass;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 14949
diff changeset
   849
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   850
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   851
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   852
        private VarSymbol addParameter(String name, Type p, boolean genArg) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   853
            VarSymbol vsym = new VarSymbol(0, names.fromString(name), p, localContext.bridgeSym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   854
            params.append(make.VarDef(vsym, null));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   855
            if (genArg) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   856
                args.append(make.Ident(vsym));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   857
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   858
            return vsym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   859
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   860
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   861
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   862
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   863
     * Bridges a member reference - this is needed when:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   864
     * * Var args in the referenced method need to be flattened away
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   865
     * * super is used
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   866
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   867
    private void bridgeMemberReference(JCMemberReference tree, ReferenceTranslationContext localContext) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   868
        kInfo.addMethod(new MemberReferenceBridger(tree, localContext).bridge());
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   869
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   870
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   871
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   872
     * 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
   873
     */
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   874
    private JCExpression makeMetaFactoryIndyCall(JCFunctionalExpression tree, boolean needsAltMetafactory,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   875
            boolean isSerializable, int refKind, Symbol refSym, List<JCExpression> indy_args) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   876
        //determine the static bsm args
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15360
diff changeset
   877
        Type mtype = types.erasure(tree.descriptorType);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15360
diff changeset
   878
        MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.type.tsym);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   879
        List<Object> staticArgs = List.<Object>of(
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   880
                new Pool.MethodHandle(ClassFile.REF_invokeInterface,
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   881
                    types.findDescriptorSymbol(tree.type.tsym), types),
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14724
diff changeset
   882
                new Pool.MethodHandle(refKind, refSym, types),
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   883
                new MethodType(mtype.getParameterTypes(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   884
                        mtype.getReturnType(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   885
                        mtype.getThrownTypes(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   886
                        syms.methodClass));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   887
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   888
        //computed indy arg types
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   889
        ListBuffer<Type> indy_args_types = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   890
        for (JCExpression arg : indy_args) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   891
            indy_args_types.append(arg.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   892
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   893
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   894
        //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
   895
        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
   896
                tree.type,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   897
                List.<Type>nil(),
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   898
                syms.methodClass);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   899
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   900
        Name metafactoryName = needsAltMetafactory ?
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   901
                names.altMetaFactory : names.metaFactory;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   902
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   903
        if (needsAltMetafactory) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   904
            ListBuffer<Object> markers = ListBuffer.lb();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   905
            for (Symbol t : tree.targets.tail) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   906
                if (t != syms.serializableType.tsym) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   907
                    markers.append(t);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   908
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   909
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   910
            int flags = isSerializable? FLAG_SERIALIZABLE : 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   911
            boolean hasMarkers = markers.nonEmpty();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   912
            flags |= hasMarkers ? FLAG_MARKERS : 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   913
            staticArgs = staticArgs.append(flags);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   914
            if (hasMarkers) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   915
                staticArgs = staticArgs.append(markers.length());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   916
                staticArgs = staticArgs.appendList(markers.toList());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   917
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   918
            if (isSerializable) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   919
                addDeserializationCase(refKind, refSym, tree.type, samSym,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   920
                        tree, staticArgs, indyType);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   921
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   922
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   923
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
   924
        return makeIndyCall(tree, syms.lambdaMetafactory, metafactoryName, staticArgs, indyType, indy_args);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   925
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   926
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   927
    /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   928
     * 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
   929
     * arguments types
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   930
     */
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   931
    private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmName,
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   932
            List<Object> staticArgs, MethodType indyType, List<JCExpression> indyArgs) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   933
        int prevPos = make.pos;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   934
        try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   935
            make.at(pos);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   936
            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
   937
                    syms.stringType,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   938
                    syms.methodTypeType).appendList(bsmStaticArgToTypes(staticArgs));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   939
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   940
            Symbol bsm = rs.resolveInternalMethod(pos, attrEnv, site,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   941
                    bsmName, bsm_staticArgs, List.<Type>nil());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   942
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   943
            DynamicMethodSymbol dynSym =
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   944
                    new DynamicMethodSymbol(names.lambda,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   945
                                            syms.noSymbol,
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   946
                                            bsm.isStatic() ?
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   947
                                                ClassFile.REF_invokeStatic :
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
   948
                                                ClassFile.REF_invokeVirtual,
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   949
                                            (MethodSymbol)bsm,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   950
                                            indyType,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   951
                                            staticArgs.toArray());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   952
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   953
            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
   954
            qualifier.sym = dynSym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   955
            qualifier.type = indyType.getReturnType();
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
            JCMethodInvocation proxyCall = make.Apply(List.<JCExpression>nil(), qualifier, indyArgs);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   958
            proxyCall.type = indyType.getReturnType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   959
            return proxyCall;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   960
        } finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   961
            make.at(prevPos);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   962
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   963
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   964
    //where
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   965
    private List<Type> bsmStaticArgToTypes(List<Object> args) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   966
        ListBuffer<Type> argtypes = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   967
        for (Object arg : args) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   968
            argtypes.append(bsmStaticArgToType(arg));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   969
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   970
        return argtypes.toList();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   971
    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   972
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   973
    private Type bsmStaticArgToType(Object arg) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   974
        Assert.checkNonNull(arg);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   975
        if (arg instanceof ClassSymbol) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   976
            return syms.classType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   977
        } else if (arg instanceof Integer) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   978
            return syms.intType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   979
        } else if (arg instanceof Long) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   980
            return syms.longType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   981
        } else if (arg instanceof Float) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   982
            return syms.floatType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   983
        } else if (arg instanceof Double) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   984
            return syms.doubleType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   985
        } else if (arg instanceof String) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   986
            return syms.stringType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   987
        } else if (arg instanceof Pool.MethodHandle) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   988
            return syms.methodHandleType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   989
        } else if (arg instanceof MethodType) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   990
            return syms.methodTypeType;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   991
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   992
            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
   993
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   994
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
   995
    }
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
     * 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
   999
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1000
    private int referenceKind(Symbol refSym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1001
        if (refSym.isConstructor()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1002
            return ClassFile.REF_newInvokeSpecial;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1003
        } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1004
            if (refSym.isStatic()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1005
                return ClassFile.REF_invokeStatic;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1006
            } else if (refSym.enclClass().isInterface()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1007
                return ClassFile.REF_invokeInterface;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1008
            } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1009
                return ClassFile.REF_invokeVirtual;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1010
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1011
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1012
    }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1013
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1014
    // </editor-fold>
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1015
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1016
    // <editor-fold defaultstate="collapsed" desc="Lambda/reference analyzer">\
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
     * 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
  1019
     * 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
  1020
     * accessed by the lambda being translated (as well as other useful info).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1021
     */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1022
    class LambdaAnalyzer extends TreeScanner {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1023
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1024
        /** 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
  1025
        private List<Frame> frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1026
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1027
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1028
         * 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
  1029
         * names)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1030
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1031
        private int lambdaCount = 0;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1032
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1033
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1034
         * keep the count of lambda expression defined in given context (used to
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1035
         * generate unambiguous names for serializable lambdas)
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1036
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1037
        private Map<String, Integer> serializableLambdaCounts =
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1038
                new HashMap<String, Integer>();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1039
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1040
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1041
         * maps for fake clinit symbols to be used as owners of lambda occurring in
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1042
         * a static var init context
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1043
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1044
        private Map<ClassSymbol, Symbol> clinits =
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1045
                new HashMap<ClassSymbol, Symbol>();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1046
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1047
        private void analyzeClass(JCClassDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1048
            frameStack = List.nil();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1049
            scan(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1050
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1051
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1052
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1053
        public void visitBlock(JCBlock tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1054
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1055
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1056
                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
  1057
                    frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1058
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1059
                super.visitBlock(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1060
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1061
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1062
                frameStack = prevStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1063
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1064
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1065
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1066
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1067
        public void visitClassDef(JCClassDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1068
            List<Frame> prevStack = frameStack;
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1069
            Map<String, Integer> prevSerializableLambdaCount =
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1070
                    serializableLambdaCounts;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1071
            Map<ClassSymbol, Symbol> prevClinits = clinits;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1072
            try {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1073
                serializableLambdaCounts = new HashMap<String, Integer>();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1074
                prevClinits = new HashMap<ClassSymbol, Symbol>();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1075
                if (directlyEnclosingLambda() != null) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1076
                    tree.sym.owner = owner();
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1077
                    if (tree.sym.hasOuterInstance()) {
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1078
                        //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
  1079
                        //its enclosing instance (if any)
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1080
                        ((LambdaTranslationContext) context())
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1081
                                .addSymbol(tree.sym.type.getEnclosingType().tsym, CAPTURED_THIS);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1082
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1083
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1084
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1085
                super.visitClassDef(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1086
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1087
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1088
                frameStack = prevStack;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1089
                serializableLambdaCounts = prevSerializableLambdaCount;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1090
                clinits = prevClinits;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1091
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1092
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1093
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1094
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1095
        public void visitIdent(JCIdent tree) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1096
            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
  1097
                if (tree.sym.kind == VAR &&
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1098
                        tree.sym.owner.kind == MTH &&
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1099
                        tree.type.constValue() == null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1100
                    TranslationContext<?> localContext = context();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1101
                    while (localContext != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1102
                        if (localContext.tree.getTag() == LAMBDA) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1103
                            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
  1104
                            if (block == null) break;
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1105
                            ((LambdaTranslationContext)localContext)
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1106
                                    .addSymbol(tree.sym, CAPTURED_VAR);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1107
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1108
                        localContext = localContext.prev;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1109
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1110
                } 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
  1111
                    TranslationContext<?> localContext = context();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1112
                    while (localContext != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1113
                        if (localContext.tree.hasTag(LAMBDA)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1114
                            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
  1115
                            if (block == null) break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1116
                            switch (block.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1117
                                case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1118
                                    JCClassDecl cdecl = (JCClassDecl)block;
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1119
                                    ((LambdaTranslationContext)localContext)
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1120
                                            .addSymbol(cdecl.sym, CAPTURED_THIS);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1121
                                    break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1122
                                default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1123
                                    Assert.error("bad block kind");
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1124
                            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1125
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1126
                        localContext = localContext.prev;
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
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1129
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1130
            super.visitIdent(tree);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1131
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1132
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1133
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1134
        public void visitLambda(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1135
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1136
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1137
                LambdaTranslationContext context = (LambdaTranslationContext)makeLambdaContext(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1138
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1139
                for (JCVariableDecl param : tree.params) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1140
                    context.addSymbol(param.sym, PARAM);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1141
                    frameStack.head.addLocal(param.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1142
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1143
                contextMap.put(tree, context);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1144
                scan(tree.body);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1145
                context.complete();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1146
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1147
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1148
                frameStack = prevStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1149
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1150
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1151
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1152
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1153
        public void visitMethodDef(JCMethodDecl tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1154
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1155
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1156
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1157
                super.visitMethodDef(tree);
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
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1160
                frameStack = prevStack;
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
        }
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
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1165
        public void visitNewClass(JCNewClass tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1166
            if (lambdaNewClassFilter(context(), tree)) {
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1167
                ((LambdaTranslationContext) context())
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1168
                        .addSymbol(tree.type.getEnclosingType().tsym, CAPTURED_THIS);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1169
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1170
            super.visitNewClass(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1171
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1172
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1173
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1174
        public void visitReference(JCMemberReference tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1175
            scan(tree.getQualifierExpression());
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1176
            contextMap.put(tree, makeReferenceContext(tree));
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1179
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1180
        public void visitSelect(JCFieldAccess tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1181
            if (context() != null && lambdaSelectSymbolFilter(tree.sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1182
                TranslationContext<?> localContext = context();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1183
                while (localContext != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1184
                    if (localContext.tree.hasTag(LAMBDA)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1185
                        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
  1186
                        if (clazz == null) break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1187
                        ((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
  1188
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1189
                    localContext = localContext.prev;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1190
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1191
                scan(tree.selected);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1192
            } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1193
                super.visitSelect(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1194
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1195
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1196
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1197
        @Override
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1198
        public void visitVarDef(JCVariableDecl tree) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1199
            TranslationContext<?> context = context();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1200
            LambdaTranslationContext ltc = (context != null && context instanceof LambdaTranslationContext)?
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1201
                    (LambdaTranslationContext)context :
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1202
                    null;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1203
            if (ltc != null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1204
                if (frameStack.head.tree.hasTag(LAMBDA)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1205
                    ltc.addSymbol(tree.sym, LOCAL_VAR);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1206
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1207
                // Check for type variables (including as type arguments).
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1208
                // If they occur within class nested in a lambda, mark for erasure
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1209
                Type type = tree.sym.asType();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1210
                if (inClassWithinLambda() && !types.isSameType(types.erasure(type), type)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1211
                    ltc.addSymbol(tree.sym, TYPE_VAR);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1212
                }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1213
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1214
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1215
            List<Frame> prevStack = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1216
            try {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1217
                if (tree.sym.owner.kind == MTH) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1218
                    frameStack.head.addLocal(tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1219
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1220
                frameStack = frameStack.prepend(new Frame(tree));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1221
                super.visitVarDef(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1222
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1223
            finally {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1224
                frameStack = prevStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1225
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1226
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1227
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1228
        private Name lambdaName() {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1229
            return names.lambda.append(names.fromString("" + lambdaCount++));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1230
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1231
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1232
        private Name serializedLambdaName(Symbol owner) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1233
            StringBuilder buf = new StringBuilder();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1234
            buf.append(names.lambda);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1235
            buf.append(owner.name);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1236
            buf.append('$');
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1237
            int methTypeHash = methodSig(owner.type).hashCode();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1238
            buf.append(methTypeHash);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1239
            buf.append('$');
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1240
            String temp = buf.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1241
            Integer count = serializableLambdaCounts.get(temp);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1242
            if (count == null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1243
                count = 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1244
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1245
            buf.append(count++);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1246
            serializableLambdaCounts.put(temp, count);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1247
            return names.fromString(buf.toString());
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1248
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1249
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1250
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1251
         * 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
  1252
         * (required to skip synthetic lambda symbols)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1253
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1254
        private Symbol owner() {
15379
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1255
            return owner(false);
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1256
        }
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1257
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1258
        @SuppressWarnings("fallthrough")
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1259
        private Symbol owner(boolean skipLambda) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1260
            List<Frame> frameStack2 = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1261
            while (frameStack2.nonEmpty()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1262
                switch (frameStack2.head.tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1263
                    case VARDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1264
                        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
  1265
                            frameStack2 = frameStack2.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1266
                            break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1267
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1268
                        JCClassDecl cdecl = (JCClassDecl)frameStack2.tail.head.tree;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1269
                        return initSym(cdecl.sym,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1270
                                ((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
  1271
                    case BLOCK:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1272
                        JCClassDecl cdecl2 = (JCClassDecl)frameStack2.tail.head.tree;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1273
                        return initSym(cdecl2.sym,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1274
                                ((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
  1275
                    case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1276
                        return ((JCClassDecl)frameStack2.head.tree).sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1277
                    case METHODDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1278
                        return ((JCMethodDecl)frameStack2.head.tree).sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1279
                    case LAMBDA:
15379
c483442d0939 8006684: Compiler produces java.lang.VerifyError: Bad type on operand stack
mcimadamore
parents: 15374
diff changeset
  1280
                        if (!skipLambda)
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1281
                            return ((LambdaTranslationContext)contextMap
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1282
                                    .get(frameStack2.head.tree)).translatedSym;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1283
                    default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1284
                        frameStack2 = frameStack2.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1285
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1286
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1287
            Assert.error();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1288
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1289
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1290
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1291
        private Symbol initSym(ClassSymbol csym, long flags) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1292
            boolean isStatic = (flags & STATIC) != 0;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1293
            if (isStatic) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1294
                //static clinits are generated in Gen - so we need to fake them
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1295
                Symbol clinit = clinits.get(csym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1296
                if (clinit == null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1297
                    clinit = makeSyntheticMethod(STATIC,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1298
                            names.clinit,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1299
                            new MethodType(List.<Type>nil(), syms.voidType, List.<Type>nil(), syms.methodClass),
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1300
                            csym);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1301
                    clinits.put(csym, clinit);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1302
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1303
                return clinit;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1304
            } else {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1305
                //get the first constructor and treat it as the instance init sym
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1306
                for (Symbol s : csym.members_field.getElementsByName(names.init)) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1307
                    return s;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1308
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1309
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1310
            Assert.error("init not found");
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1311
            return null;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1312
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1313
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1314
        private JCTree directlyEnclosingLambda() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1315
            if (frameStack.isEmpty()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1316
                return null;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1317
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1318
            List<Frame> frameStack2 = frameStack;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1319
            while (frameStack2.nonEmpty()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1320
                switch (frameStack2.head.tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1321
                    case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1322
                    case METHODDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1323
                        return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1324
                    case LAMBDA:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1325
                        return frameStack2.head.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1326
                    default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1327
                        frameStack2 = frameStack2.tail;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1328
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1329
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1330
            Assert.error();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1331
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1332
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1333
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1334
        private boolean inClassWithinLambda() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1335
            if (frameStack.isEmpty()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1336
                return false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1337
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1338
            List<Frame> frameStack2 = frameStack;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1339
            boolean classFound = false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1340
            while (frameStack2.nonEmpty()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1341
                switch (frameStack2.head.tree.getTag()) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1342
                    case LAMBDA:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1343
                        return classFound;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1344
                    case CLASSDEF:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1345
                        classFound = true;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1346
                        frameStack2 = frameStack2.tail;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1347
                        break;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1348
                    default:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1349
                        frameStack2 = frameStack2.tail;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1350
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1351
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1352
            // No lambda
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1353
            return false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1354
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1355
14365
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
         * 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
  1358
         * 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
  1359
         * 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
  1360
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1361
        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
  1362
            int currentDepth = frameStack.size() - 1;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1363
            for (Frame block : frameStack) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1364
                switch (block.tree.getTag()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1365
                    case CLASSDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1366
                        ClassSymbol clazz = ((JCClassDecl)block.tree).sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1367
                        if (sym.isMemberOf(clazz, types)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1368
                            return currentDepth > depth ? null : block.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1369
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1370
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1371
                    case VARDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1372
                        if (((JCVariableDecl)block.tree).sym == sym &&
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1373
                                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
  1374
                            return currentDepth > depth ? null : block.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1375
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1376
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1377
                    case BLOCK:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1378
                    case METHODDEF:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1379
                    case LAMBDA:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1380
                        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
  1381
                            return currentDepth > depth ? null : block.tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1382
                        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1383
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1384
                    default:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1385
                        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
  1386
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1387
                currentDepth--;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1388
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1389
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1390
        }
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
        private TranslationContext<?> context() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1393
            for (Frame frame : frameStack) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1394
                TranslationContext<?> context = contextMap.get(frame.tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1395
                if (context != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1396
                    return context;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1397
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1398
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1399
            return null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1400
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1401
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1402
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1403
         *  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
  1404
         *  when translating away lambda expressions
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1405
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1406
        private boolean lambdaIdentSymbolFilter(Symbol sym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1407
            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
  1408
                    && !sym.isStatic()
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1409
                    && sym.name != names.init;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1410
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1411
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1412
        private boolean lambdaSelectSymbolFilter(Symbol sym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1413
            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
  1414
                        !sym.isStatic() &&
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1415
                        (sym.name == names._this ||
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1416
                        sym.name == names._super);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1417
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1418
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1419
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1420
         * 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
  1421
         * be qualified with an enclosing tree
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1422
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1423
        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
  1424
            if (context != null
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1425
                    && tree.encl == null
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1426
                    && tree.def == null
14537
ad188879b6fe 8003306: Compiler crash: calculation of inner class access modifier
rfield
parents: 14365
diff changeset
  1427
                    && !tree.type.getEnclosingType().hasTag(NONE)) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1428
                Type encl = tree.type.getEnclosingType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1429
                Type current = context.owner.enclClass().type;
14537
ad188879b6fe 8003306: Compiler crash: calculation of inner class access modifier
rfield
parents: 14365
diff changeset
  1430
                while (!current.hasTag(NONE)) {
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1431
                    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
  1432
                        return true;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1433
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1434
                    current = current.getEnclosingType();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1435
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1436
                return false;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1437
            } else {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1438
                return false;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1439
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1440
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1441
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1442
        private TranslationContext<JCLambda> makeLambdaContext(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1443
            return new LambdaTranslationContext(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1444
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1445
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1446
        private TranslationContext<JCMemberReference> makeReferenceContext(JCMemberReference tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1447
            return new ReferenceTranslationContext(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1448
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1449
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1450
        private class Frame {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1451
            final JCTree tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1452
            List<Symbol> locals;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1453
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1454
            public Frame(JCTree tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1455
                this.tree = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1456
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1457
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1458
            void addLocal(Symbol sym) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1459
                if (locals == null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1460
                    locals = List.nil();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1461
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1462
                locals = locals.prepend(sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1463
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1464
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1465
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1466
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1467
         * 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
  1468
         * lambda expression/method references (see subclasses).
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1469
         */
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15360
diff changeset
  1470
        private 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
  1471
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1472
            /** the underlying (untranslated) tree */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1473
            T tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1474
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1475
            /** points to the adjusted enclosing scope in which this lambda/mref expression occurs */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1476
            Symbol owner;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1477
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1478
            /** the depth of this lambda expression in the frame stack */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1479
            int depth;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1480
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1481
            /** the enclosing translation context (set for nested lambdas/mref) */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1482
            TranslationContext<?> prev;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1483
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1484
            TranslationContext(T tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1485
                this.tree = tree;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1486
                this.owner = owner();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1487
                this.depth = frameStack.size() - 1;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1488
                this.prev = context();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1489
            }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1490
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1491
            /** does this functional expression need to be created using alternate metafactory? */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1492
            boolean needsAltMetafactory() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1493
                return (tree.targets.length() > 1 ||
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1494
                        isSerializable());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1495
            }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1496
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1497
            /** does this functional expression require serialization support? */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1498
            boolean isSerializable() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1499
                for (Symbol target : tree.targets) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1500
                    if (types.asSuper(target.type, syms.serializableType.tsym) != null) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1501
                        return true;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1502
                    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1503
                }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1504
                return false;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1505
            }
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1506
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1507
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1508
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1509
         * 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
  1510
         * 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
  1511
         * 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
  1512
         * to captured locals/members, etc.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1513
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1514
        private class LambdaTranslationContext extends TranslationContext<JCLambda> {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1515
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1516
            /** variable in the enclosing context to which this lambda is assigned */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1517
            Symbol self;
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
            /** map from original to translated lambda parameters */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1520
            Map<Symbol, Symbol> lambdaParams = new LinkedHashMap<Symbol, Symbol>();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1521
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1522
            /** map from original to translated lambda locals */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1523
            Map<Symbol, Symbol> lambdaLocals = new LinkedHashMap<Symbol, Symbol>();
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
            /** map from variables in enclosing scope to translated synthetic parameters */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1526
            Map<Symbol, Symbol> capturedLocals  = new LinkedHashMap<Symbol, Symbol>();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1527
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1528
            /** map from class symbols to translated synthetic parameters (for captured member access) */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1529
            Map<Symbol, Symbol> capturedThis = new LinkedHashMap<Symbol, Symbol>();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1530
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1531
            /** map from original to translated lambda locals */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1532
            Map<Symbol, Symbol> typeVars = new LinkedHashMap<Symbol, Symbol>();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1533
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1534
            /** the synthetic symbol for the method hoisting the translated lambda */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1535
            Symbol translatedSym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1536
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1537
            List<JCVariableDecl> syntheticParams;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1538
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1539
            LambdaTranslationContext(JCLambda tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1540
                super(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1541
                Frame frame = frameStack.head;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1542
                if (frame.tree.hasTag(VARDEF)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1543
                    self = ((JCVariableDecl)frame.tree).sym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1544
                }
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1545
                Name name = isSerializable() ? serializedLambdaName(owner) : lambdaName();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1546
                this.translatedSym = makeSyntheticMethod(0, name, null, owner.enclClass());
14365
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1549
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1550
             * 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
  1551
             * synthetic lambda body
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1552
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1553
            Symbol translate(String name, Symbol sym, LambdaSymbolKind skind) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1554
                switch (skind) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1555
                    case CAPTURED_THIS:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1556
                        return sym;  // self represented
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1557
                    case TYPE_VAR:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1558
                        // Just erase the type var
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1559
                        return new VarSymbol(sym.flags(), names.fromString(name),
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1560
                                types.erasure(sym.type), sym.owner);
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1561
                    default:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1562
                        return makeSyntheticVar(FINAL, name, types.erasure(sym.type), translatedSym);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1563
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1564
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1565
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1566
            void addSymbol(Symbol sym, LambdaSymbolKind skind) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1567
                Map<Symbol, Symbol> transMap = null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1568
                String preferredName;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1569
                switch (skind) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1570
                    case CAPTURED_THIS:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1571
                        transMap = capturedThis;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1572
                        preferredName = "encl$" + capturedThis.size();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1573
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1574
                    case CAPTURED_VAR:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1575
                        transMap = capturedLocals;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1576
                        preferredName = "cap$" + capturedLocals.size();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1577
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1578
                    case LOCAL_VAR:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1579
                        transMap = lambdaLocals;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1580
                        preferredName = sym.name.toString();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1581
                        break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1582
                    case PARAM:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1583
                        transMap = lambdaParams;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1584
                        preferredName = sym.name.toString();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1585
                        break;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1586
                    case TYPE_VAR:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1587
                        transMap = typeVars;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1588
                        preferredName = sym.name.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1589
                        break;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1590
                    default: throw new AssertionError();
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
                if (!transMap.containsKey(sym)) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1593
                    transMap.put(sym, translate(preferredName, sym, skind));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1594
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1595
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1596
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1597
            Map<Symbol, Symbol> getSymbolMap(LambdaSymbolKind... skinds) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1598
                LinkedHashMap<Symbol, Symbol> translationMap = new LinkedHashMap<Symbol, Symbol>();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1599
                for (LambdaSymbolKind skind : skinds) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1600
                    switch (skind) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1601
                        case CAPTURED_THIS:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1602
                            translationMap.putAll(capturedThis);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1603
                            break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1604
                        case CAPTURED_VAR:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1605
                            translationMap.putAll(capturedLocals);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1606
                            break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1607
                        case LOCAL_VAR:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1608
                            translationMap.putAll(lambdaLocals);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1609
                            break;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1610
                        case PARAM:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1611
                            translationMap.putAll(lambdaParams);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1612
                            break;
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1613
                        case TYPE_VAR:
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1614
                            translationMap.putAll(typeVars);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1615
                            break;
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1616
                        default: throw new AssertionError();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1617
                    }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1618
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1619
                return translationMap;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1620
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1621
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1622
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1623
             * 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
  1624
             * 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
  1625
             * "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
  1626
             * and full parameter list.
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1627
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1628
            void complete() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1629
                if (syntheticParams != null) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1630
                    return;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1631
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1632
                boolean inInterface = translatedSym.owner.isInterface();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1633
                boolean thisReferenced = !getSymbolMap(CAPTURED_THIS).isEmpty();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1634
                boolean needInstance = thisReferenced || inInterface;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1635
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1636
                // If instance access isn't needed, make it static
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1637
                // Interface methods much be public default methods, otherwise make it private
16308
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1638
                translatedSym.flags_field = SYNTHETIC | (needInstance? 0 : STATIC) |
a0658c36f717 8008227: Mixing lambdas with anonymous classes leads to NPE thrown by compiler
mcimadamore
parents: 16300
diff changeset
  1639
                        (inInterface? PUBLIC | DEFAULT : PRIVATE);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1640
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1641
                //compute synthetic params
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1642
                ListBuffer<JCVariableDecl> params = ListBuffer.lb();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1643
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1644
                // 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
  1645
                // synthetic parameters:
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1646
                //
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1647
                // 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
  1648
                // 2) 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
  1649
                for (Symbol thisSym : getSymbolMap(CAPTURED_VAR, PARAM).values()) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1650
                    params.append(make.VarDef((VarSymbol) thisSym, null));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1651
                }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1652
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1653
                syntheticParams = params.toList();
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1654
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1655
                //prepend synthetic args to translated lambda method signature
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1656
                translatedSym.type = types.createMethodTypeWithParameters(
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1657
                        generatedLambdaSig(),
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1658
                        TreeInfo.types(syntheticParams));
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1659
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1660
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1661
            Type generatedLambdaSig() {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15360
diff changeset
  1662
                return types.erasure(tree.descriptorType);
14365
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1663
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1664
        }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1665
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1666
        /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1667
         * 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
  1668
         * 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
  1669
         * 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
  1670
         * 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
  1671
         */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1672
        private class ReferenceTranslationContext extends TranslationContext<JCMemberReference> {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1673
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1674
            final boolean isSuper;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1675
            final Symbol bridgeSym;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1676
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1677
            ReferenceTranslationContext(JCMemberReference tree) {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1678
                super(tree);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1679
                this.isSuper = tree.hasKind(ReferenceKind.SUPER);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1680
                this.bridgeSym = needsBridge()
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1681
                        ? makeSyntheticMethod(isSuper ? 0 : STATIC,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1682
                                              lambdaName().append(names.fromString("$bridge")), null,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1683
                                              owner.enclClass())
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1684
                        : null;
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1685
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1686
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1687
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1688
             * 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
  1689
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1690
            int referenceKind() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1691
                return LambdaToMethod.this.referenceKind(needsBridge() ? bridgeSym : tree.sym);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1692
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1693
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1694
            boolean needsVarArgsConversion() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1695
                return tree.varargsElement != null;
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1698
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1699
             * @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
  1700
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1701
            boolean isArrayOp() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1702
                return tree.sym.owner == syms.arrayClass;
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
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1705
            /**
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1706
             * Does this reference needs a bridge (i.e. var args need to be
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1707
             * expanded or "super" is used)
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1708
             */
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1709
            final boolean needsBridge() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1710
                return isSuper || needsVarArgsConversion() || isArrayOp();
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
            Type generatedRefSig() {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1714
                return types.erasure(tree.sym.type);
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1715
            }
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1716
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1717
            Type bridgedRefSig() {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15360
diff changeset
  1718
                return types.erasure(types.findDescriptorSymbol(tree.targets.head).type);
14365
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
        }
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
    // </editor-fold>
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
    enum LambdaSymbolKind {
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1725
        CAPTURED_VAR,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1726
        CAPTURED_THIS,
20f388573215 8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
diff changeset
  1727
        LOCAL_VAR,
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1728
        PARAM,
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1729
        TYPE_VAR;
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1730
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1731
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1732
    /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1733
     * ****************************************************************
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1734
     * Signature Generation
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1735
     * ****************************************************************
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1736
     */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1737
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1738
    private String methodSig(Type type) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1739
        L2MSignatureGenerator sg = new L2MSignatureGenerator();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1740
        sg.assembleSig(type);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1741
        return sg.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1742
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1743
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1744
    private String classSig(Type type) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1745
        L2MSignatureGenerator sg = new L2MSignatureGenerator();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1746
        sg.assembleClassSig(type);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1747
        return sg.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1748
    }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1749
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1750
    /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1751
     * Signature Generation
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1752
     */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1753
    private class L2MSignatureGenerator extends Types.SignatureGenerator {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1754
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1755
        /**
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1756
         * An output buffer for type signatures.
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1757
         */
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1758
        StringBuilder sb = new StringBuilder();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1759
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1760
        L2MSignatureGenerator() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1761
            super(types);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1762
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1763
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1764
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1765
        protected void append(char ch) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1766
            sb.append(ch);
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1767
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1768
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1769
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1770
        protected void append(byte[] ba) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1771
            sb.append(new String(ba));
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1772
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1773
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1774
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1775
        protected void append(Name name) {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1776
            sb.append(name.toString());
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1777
        }
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1778
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1779
        @Override
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1780
        public String toString() {
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1781
            return sb.toString();
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15379
diff changeset
  1782
        }
14365
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
}