langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
author vromero
Thu, 01 May 2014 20:36:11 +0100
changeset 24226 08b586e22328
parent 24066 1dfb66929538
child 24396 3c36c6afcbca
permissions -rw-r--r--
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800 Reviewed-by: dlsmith, jjg
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     1
/*
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
     2
 * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     4
 *
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    10
 *
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    15
 * accompanied this code).
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    16
 *
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    20
 *
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    23
 * questions.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    24
 */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    25
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    26
package com.sun.tools.javac.comp;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    27
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
    28
import com.sun.source.tree.LambdaExpressionTree.BodyKind;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    29
import com.sun.tools.javac.code.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    30
import com.sun.tools.javac.tree.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    31
import com.sun.tools.javac.util.*;
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16566
diff changeset
    32
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    33
import com.sun.tools.javac.code.Symbol.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    34
import com.sun.tools.javac.code.Type.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    35
import com.sun.tools.javac.comp.Attr.ResultInfo;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    36
import com.sun.tools.javac.comp.Infer.InferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    37
import com.sun.tools.javac.comp.Resolve.MethodResolutionPhase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    38
import com.sun.tools.javac.tree.JCTree.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    39
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    40
import java.util.ArrayList;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
    41
import java.util.Collections;
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
    42
import java.util.EnumSet;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
    43
import java.util.LinkedHashMap;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
    44
import java.util.LinkedHashSet;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    45
import java.util.Map;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    46
import java.util.Set;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    47
import java.util.WeakHashMap;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    48
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
    49
import static com.sun.tools.javac.code.Kinds.VAL;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
    50
import static com.sun.tools.javac.code.TypeTag.*;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    51
import static com.sun.tools.javac.tree.JCTree.Tag.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    52
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    53
/**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    54
 * This is an helper class that is used to perform deferred type-analysis.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    55
 * Each time a poly expression occurs in argument position, javac attributes it
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    56
 * with a temporary 'deferred type' that is checked (possibly multiple times)
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    57
 * against an expected formal type.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    58
 *
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    59
 *  <p><b>This is NOT part of any supported API.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    60
 *  If you write code that depends on this, you do so at your own risk.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    61
 *  This code and its internal interfaces are subject to change or
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    62
 *  deletion without notice.</b>
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    63
 */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    64
public class DeferredAttr extends JCTree.Visitor {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
    65
    protected static final Context.Key<DeferredAttr> deferredAttrKey = new Context.Key<>();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    66
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    67
    final Attr attr;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    68
    final Check chk;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
    69
    final JCDiagnostic.Factory diags;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    70
    final Enter enter;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    71
    final Infer infer;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
    72
    final Resolve rs;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    73
    final Log log;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    74
    final Symtab syms;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    75
    final TreeMaker make;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    76
    final Types types;
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
    77
    final Flow flow;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
    78
    final Names names;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    79
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    80
    public static DeferredAttr instance(Context context) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    81
        DeferredAttr instance = context.get(deferredAttrKey);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    82
        if (instance == null)
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    83
            instance = new DeferredAttr(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    84
        return instance;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    85
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    86
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    87
    protected DeferredAttr(Context context) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    88
        context.put(deferredAttrKey, this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    89
        attr = Attr.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    90
        chk = Check.instance(context);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
    91
        diags = JCDiagnostic.Factory.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    92
        enter = Enter.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    93
        infer = Infer.instance(context);
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
    94
        rs = Resolve.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    95
        log = Log.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    96
        syms = Symtab.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    97
        make = TreeMaker.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    98
        types = Types.instance(context);
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
    99
        flow = Flow.instance(context);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   100
        names = Names.instance(context);
18902
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   101
        stuckTree = make.Ident(names.empty).setType(Type.stuckType);
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   102
        emptyDeferredAttrContext =
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   103
            new DeferredAttrContext(AttrMode.CHECK, null, MethodResolutionPhase.BOX, infer.emptyContext, null, null) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   104
                @Override
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   105
                void addDeferredAttrNode(DeferredType dt, ResultInfo ri, DeferredStuckPolicy deferredStuckPolicy) {
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   106
                    Assert.error("Empty deferred context!");
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   107
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   108
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   109
                void complete() {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   110
                    Assert.error("Empty deferred context!");
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   111
                }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   112
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   113
                @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   114
                public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   115
                    return "Empty deferred context!";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   116
                }
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   117
            };
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   118
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   119
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   120
    /** shared tree for stuck expressions */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   121
    final JCTree stuckTree;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   122
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   123
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   124
     * This type represents a deferred type. A deferred type starts off with
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   125
     * no information on the underlying expression type. Such info needs to be
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   126
     * discovered through type-checking the deferred type against a target-type.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   127
     * Every deferred type keeps a pointer to the AST node from which it originated.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   128
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   129
    public class DeferredType extends Type {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   130
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   131
        public JCExpression tree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   132
        Env<AttrContext> env;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   133
        AttrMode mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   134
        SpeculativeCache speculativeCache;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   135
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   136
        DeferredType(JCExpression tree, Env<AttrContext> env) {
18646
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   137
            super(null);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   138
            this.tree = tree;
18912
e25cd61d8e59 8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents: 18910
diff changeset
   139
            this.env = attr.copyEnv(env);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   140
            this.speculativeCache = new SpeculativeCache();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   141
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   142
18646
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   143
        @Override
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   144
        public TypeTag getTag() {
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   145
            return DEFERRED;
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   146
        }
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   147
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   148
        @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   149
        public String toString() {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   150
            return "DeferredType";
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   151
        }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   152
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   153
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   154
         * A speculative cache is used to keep track of all overload resolution rounds
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   155
         * that triggered speculative attribution on a given deferred type. Each entry
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   156
         * stores a pointer to the speculative tree and the resolution phase in which the entry
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   157
         * has been added.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   158
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   159
        class SpeculativeCache {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   160
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   161
            private Map<Symbol, List<Entry>> cache = new WeakHashMap<>();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   162
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   163
            class Entry {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   164
                JCTree speculativeTree;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   165
                ResultInfo resultInfo;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   166
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   167
                public Entry(JCTree speculativeTree, ResultInfo resultInfo) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   168
                    this.speculativeTree = speculativeTree;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   169
                    this.resultInfo = resultInfo;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   170
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   171
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   172
                boolean matches(MethodResolutionPhase phase) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   173
                    return resultInfo.checkContext.deferredAttrContext().phase == phase;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   174
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   175
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   176
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   177
            /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   178
             * Retrieve a speculative cache entry corresponding to given symbol
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   179
             * and resolution phase
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   180
             */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   181
            Entry get(Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   182
                List<Entry> entries = cache.get(msym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   183
                if (entries == null) return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   184
                for (Entry e : entries) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   185
                    if (e.matches(phase)) return e;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   186
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   187
                return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   188
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   189
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   190
            /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   191
             * Stores a speculative cache entry corresponding to given symbol
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   192
             * and resolution phase
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   193
             */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   194
            void put(JCTree speculativeTree, ResultInfo resultInfo) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   195
                Symbol msym = resultInfo.checkContext.deferredAttrContext().msym;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   196
                List<Entry> entries = cache.get(msym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   197
                if (entries == null) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   198
                    entries = List.nil();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   199
                }
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   200
                cache.put(msym, entries.prepend(new Entry(speculativeTree, resultInfo)));
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   201
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   202
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   203
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   204
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   205
         * Get the type that has been computed during a speculative attribution round
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   206
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   207
        Type speculativeType(Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   208
            SpeculativeCache.Entry e = speculativeCache.get(msym, phase);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   209
            return e != null ? e.speculativeTree.type : Type.noType;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   210
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   211
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   212
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   213
         * Check a deferred type against a potential target-type. Depending on
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   214
         * the current attribution mode, a normal vs. speculative attribution
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   215
         * round is performed on the underlying AST node. There can be only one
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   216
         * speculative round for a given target method symbol; moreover, a normal
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   217
         * attribution round must follow one or more speculative rounds.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   218
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   219
        Type check(ResultInfo resultInfo) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   220
            DeferredStuckPolicy deferredStuckPolicy;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   221
            if (resultInfo.pt.hasTag(NONE) || resultInfo.pt.isErroneous()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   222
                deferredStuckPolicy = dummyStuckPolicy;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   223
            } else if (resultInfo.checkContext.deferredAttrContext().mode == AttrMode.SPECULATIVE) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   224
                deferredStuckPolicy = new OverloadStuckPolicy(resultInfo, this);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   225
            } else {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   226
                deferredStuckPolicy = new CheckStuckPolicy(resultInfo, this);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   227
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   228
            return check(resultInfo, deferredStuckPolicy, basicCompleter);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   229
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   230
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   231
        private Type check(ResultInfo resultInfo, DeferredStuckPolicy deferredStuckPolicy,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   232
                DeferredTypeCompleter deferredTypeCompleter) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   233
            DeferredAttrContext deferredAttrContext =
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   234
                    resultInfo.checkContext.deferredAttrContext();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   235
            Assert.check(deferredAttrContext != emptyDeferredAttrContext);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   236
            if (deferredStuckPolicy.isStuck()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   237
                deferredAttrContext.addDeferredAttrNode(this, resultInfo, deferredStuckPolicy);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   238
                return Type.noType;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   239
            } else {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   240
                try {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   241
                    return deferredTypeCompleter.complete(this, resultInfo, deferredAttrContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   242
                } finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   243
                    mode = deferredAttrContext.mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   244
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   245
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   246
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   247
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   248
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   249
    /**
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   250
     * A completer for deferred types. Defines an entry point for type-checking
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   251
     * a deferred type.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   252
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   253
    interface DeferredTypeCompleter {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   254
        /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   255
         * Entry point for type-checking a deferred type. Depending on the
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   256
         * circumstances, type-checking could amount to full attribution
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   257
         * or partial structural check (aka potential applicability).
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   258
         */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   259
        Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   260
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   261
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   262
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   263
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   264
     * A basic completer for deferred types. This completer type-checks a deferred type
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   265
     * using attribution; depending on the attribution mode, this could be either standard
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   266
     * or speculative attribution.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   267
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   268
    DeferredTypeCompleter basicCompleter = new DeferredTypeCompleter() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   269
        public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   270
            switch (deferredAttrContext.mode) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   271
                case SPECULATIVE:
16566
604ce45d5f23 8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents: 16326
diff changeset
   272
                    //Note: if a symbol is imported twice we might do two identical
604ce45d5f23 8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents: 16326
diff changeset
   273
                    //speculative rounds...
604ce45d5f23 8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents: 16326
diff changeset
   274
                    Assert.check(dt.mode == null || dt.mode == AttrMode.SPECULATIVE);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   275
                    JCTree speculativeTree = attribSpeculative(dt.tree, dt.env, resultInfo);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   276
                    dt.speculativeCache.put(speculativeTree, resultInfo);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   277
                    return speculativeTree.type;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   278
                case CHECK:
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   279
                    Assert.check(dt.mode != null);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   280
                    return attr.attribTree(dt.tree, dt.env, resultInfo);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   281
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   282
            Assert.error();
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   283
            return null;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   284
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   285
    };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   286
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   287
    DeferredTypeCompleter dummyCompleter = new DeferredTypeCompleter() {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   288
        public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   289
            Assert.check(deferredAttrContext.mode == AttrMode.CHECK);
18912
e25cd61d8e59 8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents: 18910
diff changeset
   290
            return dt.tree.type = Type.stuckType;
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   291
        }
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   292
    };
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   293
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   294
    /**
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   295
     * Policy for detecting stuck expressions. Different criteria might cause
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   296
     * an expression to be judged as stuck, depending on whether the check
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   297
     * is performed during overload resolution or after most specific.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   298
     */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   299
    interface DeferredStuckPolicy {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   300
        /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   301
         * Has the policy detected that a given expression should be considered stuck?
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   302
         */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   303
        boolean isStuck();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   304
        /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   305
         * Get the set of inference variables a given expression depends upon.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   306
         */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   307
        Set<Type> stuckVars();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   308
        /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   309
         * Get the set of inference variables which might get new constraints
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   310
         * if a given expression is being type-checked.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   311
         */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   312
        Set<Type> depVars();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   313
    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   314
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   315
    /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   316
     * Basic stuck policy; an expression is never considered to be stuck.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   317
     */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   318
    DeferredStuckPolicy dummyStuckPolicy = new DeferredStuckPolicy() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   319
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   320
        public boolean isStuck() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   321
            return false;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   322
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   323
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   324
        public Set<Type> stuckVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   325
            return Collections.emptySet();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   326
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   327
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   328
        public Set<Type> depVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   329
            return Collections.emptySet();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   330
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   331
    };
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   332
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   333
    /**
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   334
     * The 'mode' in which the deferred type is to be type-checked
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   335
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   336
    public enum AttrMode {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   337
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   338
         * A speculative type-checking round is used during overload resolution
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   339
         * mainly to generate constraints on inference variables. Side-effects
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   340
         * arising from type-checking the expression associated with the deferred
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   341
         * type are reversed after the speculative round finishes. This means the
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   342
         * expression tree will be left in a blank state.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   343
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   344
        SPECULATIVE,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   345
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   346
         * This is the plain type-checking mode. Produces side-effects on the underlying AST node
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   347
         */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   348
        CHECK
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   349
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   350
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   351
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   352
     * Routine that performs speculative type-checking; the input AST node is
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   353
     * cloned (to avoid side-effects cause by Attr) and compiler state is
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   354
     * restored after type-checking. All diagnostics (but critical ones) are
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   355
     * disabled during speculative type-checking.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   356
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   357
    JCTree attribSpeculative(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   358
        final JCTree newTree = new TreeCopier<>(make).copy(tree);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   359
        Env<AttrContext> speculativeEnv = env.dup(newTree, env.info.dup(env.info.scope.dupUnshared()));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   360
        speculativeEnv.info.scope.owner = env.info.scope.owner;
14538
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   361
        Log.DeferredDiagnosticHandler deferredDiagnosticHandler =
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   362
                new Log.DeferredDiagnosticHandler(log, new Filter<JCDiagnostic>() {
16309
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   363
            public boolean accepts(final JCDiagnostic d) {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   364
                class PosScanner extends TreeScanner {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   365
                    boolean found = false;
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   366
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   367
                    @Override
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   368
                    public void scan(JCTree tree) {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   369
                        if (tree != null &&
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   370
                                tree.pos() == d.getDiagnosticPosition()) {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   371
                            found = true;
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   372
                        }
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   373
                        super.scan(tree);
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   374
                    }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   375
                }
16309
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   376
                PosScanner posScanner = new PosScanner();
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   377
                posScanner.scan(newTree);
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   378
                return posScanner.found;
14538
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   379
            }
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   380
        });
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   381
        try {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   382
            attr.attribTree(newTree, speculativeEnv, resultInfo);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   383
            unenterScanner.scan(newTree);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   384
            return newTree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   385
        } finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   386
            unenterScanner.scan(newTree);
14538
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   387
            log.popDiagnosticHandler(deferredDiagnosticHandler);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   388
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   389
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   390
    //where
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   391
        protected UnenterScanner unenterScanner = new UnenterScanner();
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   392
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   393
        class UnenterScanner extends TreeScanner {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   394
            @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   395
            public void visitClassDef(JCClassDecl tree) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   396
                ClassSymbol csym = tree.sym;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   397
                //if something went wrong during method applicability check
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   398
                //it is possible that nested expressions inside argument expression
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   399
                //are left unchecked - in such cases there's nothing to clean up.
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   400
                if (csym == null) return;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   401
                enter.typeEnvs.remove(csym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   402
                chk.compiled.remove(csym.flatname);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   403
                syms.classes.remove(csym.flatname);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   404
                super.visitClassDef(tree);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   405
            }
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   406
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   407
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   408
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   409
     * A deferred context is created on each method check. A deferred context is
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   410
     * used to keep track of information associated with the method check, such as
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   411
     * the symbol of the method being checked, the overload resolution phase,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   412
     * the kind of attribution mode to be applied to deferred types and so forth.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   413
     * As deferred types are processed (by the method check routine) stuck AST nodes
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   414
     * are added (as new deferred attribution nodes) to this context. The complete()
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   415
     * routine makes sure that all pending nodes are properly processed, by
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   416
     * progressively instantiating all inference variables on which one or more
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   417
     * deferred attribution node is stuck.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   418
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   419
    class DeferredAttrContext {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   420
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   421
        /** attribution mode */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   422
        final AttrMode mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   423
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   424
        /** symbol of the method being checked */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   425
        final Symbol msym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   426
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   427
        /** method resolution step */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   428
        final Resolve.MethodResolutionPhase phase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   429
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   430
        /** inference context */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   431
        final InferenceContext inferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   432
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   433
        /** parent deferred context */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   434
        final DeferredAttrContext parent;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   435
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   436
        /** Warner object to report warnings */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   437
        final Warner warn;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   438
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   439
        /** list of deferred attribution nodes to be processed */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   440
        ArrayList<DeferredAttrNode> deferredAttrNodes = new ArrayList<>();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   441
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   442
        DeferredAttrContext(AttrMode mode, Symbol msym, MethodResolutionPhase phase,
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   443
                InferenceContext inferenceContext, DeferredAttrContext parent, Warner warn) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   444
            this.mode = mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   445
            this.msym = msym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   446
            this.phase = phase;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   447
            this.parent = parent;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   448
            this.warn = warn;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   449
            this.inferenceContext = inferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   450
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   451
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   452
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   453
         * Adds a node to the list of deferred attribution nodes - used by Resolve.rawCheckArgumentsApplicable
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   454
         * Nodes added this way act as 'roots' for the out-of-order method checking process.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   455
         */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   456
        void addDeferredAttrNode(final DeferredType dt, ResultInfo resultInfo,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   457
                DeferredStuckPolicy deferredStuckPolicy) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   458
            deferredAttrNodes.add(new DeferredAttrNode(dt, resultInfo, deferredStuckPolicy));
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   459
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   460
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   461
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   462
         * Incrementally process all nodes, by skipping 'stuck' nodes and attributing
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   463
         * 'unstuck' ones. If at any point no progress can be made (no 'unstuck' nodes)
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   464
         * some inference variable might get eagerly instantiated so that all nodes
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   465
         * can be type-checked.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   466
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   467
        void complete() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   468
            while (!deferredAttrNodes.isEmpty()) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   469
                Map<Type, Set<Type>> depVarsMap = new LinkedHashMap<>();
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   470
                List<Type> stuckVars = List.nil();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   471
                boolean progress = false;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   472
                //scan a defensive copy of the node list - this is because a deferred
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   473
                //attribution round can add new nodes to the list
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   474
                for (DeferredAttrNode deferredAttrNode : List.from(deferredAttrNodes)) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   475
                    if (!deferredAttrNode.process(this)) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   476
                        List<Type> restStuckVars =
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   477
                                List.from(deferredAttrNode.deferredStuckPolicy.stuckVars())
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   478
                                .intersect(inferenceContext.restvars());
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   479
                        stuckVars = stuckVars.prependList(restStuckVars);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   480
                        //update dependency map
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   481
                        for (Type t : List.from(deferredAttrNode.deferredStuckPolicy.depVars())
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   482
                                .intersect(inferenceContext.restvars())) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   483
                            Set<Type> prevDeps = depVarsMap.get(t);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   484
                            if (prevDeps == null) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   485
                                prevDeps = new LinkedHashSet<>();
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   486
                                depVarsMap.put(t, prevDeps);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   487
                            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   488
                            prevDeps.addAll(restStuckVars);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   489
                        }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   490
                    } else {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   491
                        deferredAttrNodes.remove(deferredAttrNode);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   492
                        progress = true;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   493
                    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   494
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   495
                if (!progress) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   496
                    DeferredAttrContext dac = this;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   497
                    while (dac != emptyDeferredAttrContext) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   498
                        if (dac.mode == AttrMode.SPECULATIVE) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   499
                            //unsticking does not take place during overload
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   500
                            break;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   501
                        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   502
                        dac = dac.parent;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   503
                    }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   504
                    //remove all variables that have already been instantiated
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   505
                    //from the list of stuck variables
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   506
                    try {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   507
                        inferenceContext.solveAny(stuckVars, depVarsMap, warn);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   508
                        inferenceContext.notifyChange();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   509
                    } catch (Infer.GraphStrategy.NodeNotFoundException ex) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   510
                        //this means that we are in speculative mode and the
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   511
                        //set of contraints are too tight for progess to be made.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   512
                        //Just leave the remaining expressions as stuck.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   513
                        break;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   514
                    }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   515
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   516
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   517
        }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   518
    }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   519
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   520
    /**
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   521
     * Class representing a deferred attribution node. It keeps track of
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   522
     * a deferred type, along with the expected target type information.
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   523
     */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   524
    class DeferredAttrNode {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   525
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   526
        /** underlying deferred type */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   527
        DeferredType dt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   528
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   529
        /** underlying target type information */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   530
        ResultInfo resultInfo;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   531
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   532
        /** stuck policy associated with this node */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   533
        DeferredStuckPolicy deferredStuckPolicy;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   534
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   535
        DeferredAttrNode(DeferredType dt, ResultInfo resultInfo, DeferredStuckPolicy deferredStuckPolicy) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   536
            this.dt = dt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   537
            this.resultInfo = resultInfo;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   538
            this.deferredStuckPolicy = deferredStuckPolicy;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   539
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   540
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   541
        /**
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   542
         * Process a deferred attribution node.
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   543
         * Invariant: a stuck node cannot be processed.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   544
         */
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   545
        @SuppressWarnings("fallthrough")
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   546
        boolean process(final DeferredAttrContext deferredAttrContext) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   547
            switch (deferredAttrContext.mode) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   548
                case SPECULATIVE:
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   549
                    if (deferredStuckPolicy.isStuck()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   550
                        dt.check(resultInfo, dummyStuckPolicy, new StructuralStuckChecker());
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   551
                        return true;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   552
                    } else {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   553
                        Assert.error("Cannot get here");
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   554
                    }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   555
                case CHECK:
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   556
                    if (deferredStuckPolicy.isStuck()) {
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   557
                        //stuck expression - see if we can propagate
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   558
                        if (deferredAttrContext.parent != emptyDeferredAttrContext &&
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   559
                                Type.containsAny(deferredAttrContext.parent.inferenceContext.inferencevars,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   560
                                        List.from(deferredStuckPolicy.stuckVars()))) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   561
                            deferredAttrContext.parent.addDeferredAttrNode(dt,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   562
                                    resultInfo.dup(new Check.NestedCheckContext(resultInfo.checkContext) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   563
                                @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   564
                                public InferenceContext inferenceContext() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   565
                                    return deferredAttrContext.parent.inferenceContext;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   566
                                }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   567
                                @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   568
                                public DeferredAttrContext deferredAttrContext() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   569
                                    return deferredAttrContext.parent;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   570
                                }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   571
                            }), deferredStuckPolicy);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   572
                            dt.tree.type = Type.stuckType;
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   573
                            return true;
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   574
                        } else {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   575
                            return false;
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   576
                        }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   577
                    } else {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   578
                        ResultInfo instResultInfo =
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   579
                                resultInfo.dup(deferredAttrContext.inferenceContext.asInstType(resultInfo.pt));
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   580
                        dt.check(instResultInfo, dummyStuckPolicy, basicCompleter);
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   581
                        return true;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   582
                    }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   583
                default:
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   584
                    throw new AssertionError("Bad mode");
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   585
            }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   586
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   587
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   588
        /**
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   589
         * Structural checker for stuck expressions
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   590
         */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   591
        class StructuralStuckChecker extends TreeScanner implements DeferredTypeCompleter {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   592
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   593
            ResultInfo resultInfo;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   594
            InferenceContext inferenceContext;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   595
            Env<AttrContext> env;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   596
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   597
            public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   598
                this.resultInfo = resultInfo;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   599
                this.inferenceContext = deferredAttrContext.inferenceContext;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   600
                this.env = dt.env;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   601
                dt.tree.accept(this);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   602
                dt.speculativeCache.put(stuckTree, resultInfo);
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   603
                return Type.noType;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   604
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   605
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   606
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   607
            public void visitLambda(JCLambda tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   608
                Check.CheckContext checkContext = resultInfo.checkContext;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   609
                Type pt = resultInfo.pt;
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   610
                if (!inferenceContext.inferencevars.contains(pt)) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   611
                    //must be a functional descriptor
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   612
                    Type descriptorType = null;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   613
                    try {
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   614
                        descriptorType = types.findDescriptorType(pt);
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   615
                    } catch (Types.FunctionDescriptorLookupError ex) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   616
                        checkContext.report(null, ex.getDiagnostic());
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   617
                    }
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   618
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   619
                    if (descriptorType.getParameterTypes().length() != tree.params.length()) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   620
                        checkContext.report(tree,
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   621
                                diags.fragment("incompatible.arg.types.in.lambda"));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   622
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   623
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   624
                    Type currentReturnType = descriptorType.getReturnType();
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   625
                    boolean returnTypeIsVoid = currentReturnType.hasTag(VOID);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   626
                    if (tree.getBodyKind() == BodyKind.EXPRESSION) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   627
                        boolean isExpressionCompatible = !returnTypeIsVoid ||
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   628
                            TreeInfo.isExpressionStatement((JCExpression)tree.getBody());
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   629
                        if (!isExpressionCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   630
                            resultInfo.checkContext.report(tree.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   631
                                diags.fragment("incompatible.ret.type.in.lambda",
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   632
                                    diags.fragment("missing.ret.val", currentReturnType)));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   633
                        }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   634
                    } else {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   635
                        LambdaBodyStructChecker lambdaBodyChecker =
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   636
                                new LambdaBodyStructChecker();
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   637
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   638
                        tree.body.accept(lambdaBodyChecker);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   639
                        boolean isVoidCompatible = lambdaBodyChecker.isVoidCompatible;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   640
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   641
                        if (returnTypeIsVoid) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   642
                            if (!isVoidCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   643
                                resultInfo.checkContext.report(tree.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   644
                                    diags.fragment("unexpected.ret.val"));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   645
                            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   646
                        } else {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   647
                            boolean isValueCompatible = lambdaBodyChecker.isPotentiallyValueCompatible
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   648
                                && !canLambdaBodyCompleteNormally(tree);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   649
                            if (!isValueCompatible && !isVoidCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   650
                                log.error(tree.body.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   651
                                    "lambda.body.neither.value.nor.void.compatible");
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   652
                            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   653
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   654
                            if (!isValueCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   655
                                resultInfo.checkContext.report(tree.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   656
                                    diags.fragment("incompatible.ret.type.in.lambda",
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   657
                                        diags.fragment("missing.ret.val", currentReturnType)));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   658
                            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   659
                        }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   660
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   661
                }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   662
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   663
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   664
            boolean canLambdaBodyCompleteNormally(JCLambda tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   665
                JCLambda newTree = new TreeCopier<>(make).copy(tree);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   666
                /* attr.lambdaEnv will create a meaningful env for the
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   667
                 * lambda expression. This is specially useful when the
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   668
                 * lambda is used as the init of a field. But we need to
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   669
                 * remove any added symbol.
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   670
                 */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   671
                Env<AttrContext> localEnv = attr.lambdaEnv(newTree, env);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   672
                try {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   673
                    List<JCVariableDecl> tmpParams = newTree.params;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   674
                    while (tmpParams.nonEmpty()) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   675
                        tmpParams.head.vartype = make.at(tmpParams.head).Type(syms.errType);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   676
                        tmpParams = tmpParams.tail;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   677
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   678
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   679
                    attr.attribStats(newTree.params, localEnv);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   680
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   681
                    /* set pt to Type.noType to avoid generating any bound
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   682
                     * which may happen if lambda's return type is an
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   683
                     * inference variable
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   684
                     */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   685
                    Attr.ResultInfo bodyResultInfo = attr.new ResultInfo(VAL, Type.noType);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   686
                    localEnv.info.returnResult = bodyResultInfo;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   687
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   688
                    // discard any log output
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   689
                    Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   690
                    try {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   691
                        JCBlock body = (JCBlock)newTree.body;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   692
                        /* we need to attribute the lambda body before
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   693
                         * doing the aliveness analysis. This is because
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   694
                         * constant folding occurs during attribution
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   695
                         * and the reachability of some statements depends
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   696
                         * on constant values, for example:
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   697
                         *
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   698
                         *     while (true) {...}
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   699
                         */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   700
                        attr.attribStats(body.stats, localEnv);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   701
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   702
                        attr.preFlow(newTree);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   703
                        /* make an aliveness / reachability analysis of the lambda
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   704
                         * to determine if it can complete normally
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   705
                         */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   706
                        flow.analyzeLambda(localEnv, newTree, make, true);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   707
                    } finally {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   708
                        log.popDiagnosticHandler(diagHandler);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   709
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   710
                    return newTree.canCompleteNormally;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   711
                } finally {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   712
                    JCBlock body = (JCBlock)newTree.body;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   713
                    unenterScanner.scan(body.stats);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   714
                    localEnv.info.scope.leave();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   715
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   716
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   717
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   718
            @Override
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   719
            public void visitNewClass(JCNewClass tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   720
                //do nothing
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   721
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   722
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   723
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   724
            public void visitApply(JCMethodInvocation tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   725
                //do nothing
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   726
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   727
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   728
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   729
            public void visitReference(JCMemberReference tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   730
                Check.CheckContext checkContext = resultInfo.checkContext;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   731
                Type pt = resultInfo.pt;
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   732
                if (!inferenceContext.inferencevars.contains(pt)) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   733
                    try {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   734
                        types.findDescriptorType(pt);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   735
                    } catch (Types.FunctionDescriptorLookupError ex) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   736
                        checkContext.report(null, ex.getDiagnostic());
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   737
                    }
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   738
                    Env<AttrContext> localEnv = env.dup(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   739
                    JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), localEnv,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   740
                            attr.memberReferenceQualifierResult(tree));
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19914
diff changeset
   741
                    ListBuffer<Type> argtypes = new ListBuffer<>();
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   742
                    for (Type t : types.findDescriptorType(pt).getParameterTypes()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   743
                        argtypes.append(Type.noType);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   744
                    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   745
                    JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   746
                    mref2.expr = exprTree;
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
   747
                    Symbol lookupSym =
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
   748
                            rs.resolveMemberReferenceByArity(localEnv, mref2, exprTree.type,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
   749
                                tree.name, argtypes.toList(), inferenceContext);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
   750
                    switch (lookupSym.kind) {
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   751
                        //note: as argtypes are erroneous types, type-errors must
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   752
                        //have been caused by arity mismatch
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   753
                        case Kinds.ABSENT_MTH:
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   754
                        case Kinds.WRONG_MTH:
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   755
                        case Kinds.WRONG_MTHS:
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
   756
                        case Kinds.WRONG_STATICNESS:
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   757
                           checkContext.report(tree, diags.fragment("incompatible.arg.types.in.mref"));
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   758
                    }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   759
                }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   760
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   761
        }
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   762
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   763
        /* This visitor looks for return statements, its analysis will determine if
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   764
         * a lambda body is void or value compatible. We must analyze return
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   765
         * statements contained in the lambda body only, thus any return statement
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   766
         * contained in an inner class or inner lambda body, should be ignored.
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   767
         */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   768
        class LambdaBodyStructChecker extends TreeScanner {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   769
            boolean isVoidCompatible = true;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   770
            boolean isPotentiallyValueCompatible = true;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   771
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   772
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   773
            public void visitClassDef(JCClassDecl tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   774
                // do nothing
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   775
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   776
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   777
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   778
            public void visitLambda(JCLambda tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   779
                // do nothing
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   780
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   781
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   782
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   783
            public void visitNewClass(JCNewClass tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   784
                // do nothing
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   785
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   786
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   787
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   788
            public void visitReturn(JCReturn tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   789
                if (tree.expr != null) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   790
                    isVoidCompatible = false;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   791
                } else {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   792
                    isPotentiallyValueCompatible = false;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   793
                }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   794
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   795
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   796
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   797
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   798
    /** an empty deferred attribution context - all methods throw exceptions */
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   799
    final DeferredAttrContext emptyDeferredAttrContext;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   800
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   801
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   802
     * Map a list of types possibly containing one or more deferred types
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   803
     * into a list of ordinary types. Each deferred type D is mapped into a type T,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   804
     * where T is computed by retrieving the type that has already been
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   805
     * computed for D during a previous deferred attribution round of the given kind.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   806
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   807
    class DeferredTypeMap extends Type.Mapping {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   808
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   809
        DeferredAttrContext deferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   810
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   811
        protected DeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   812
            super(String.format("deferredTypeMap[%s]", mode));
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   813
            this.deferredAttrContext = new DeferredAttrContext(mode, msym, phase,
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   814
                    infer.emptyContext, emptyDeferredAttrContext, types.noWarnings);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   815
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   816
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   817
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   818
        public Type apply(Type t) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14258
diff changeset
   819
            if (!t.hasTag(DEFERRED)) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   820
                return t.map(this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   821
            } else {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   822
                DeferredType dt = (DeferredType)t;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   823
                return typeOf(dt);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   824
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   825
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   826
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   827
        protected Type typeOf(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   828
            switch (deferredAttrContext.mode) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   829
                case CHECK:
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   830
                    return dt.tree.type == null ? Type.noType : dt.tree.type;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   831
                case SPECULATIVE:
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   832
                    return dt.speculativeType(deferredAttrContext.msym, deferredAttrContext.phase);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   833
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   834
            Assert.error();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   835
            return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   836
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   837
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   838
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   839
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   840
     * Specialized recovery deferred mapping.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   841
     * Each deferred type D is mapped into a type T, where T is computed either by
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   842
     * (i) retrieving the type that has already been computed for D during a previous
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   843
     * attribution round (as before), or (ii) by synthesizing a new type R for D
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   844
     * (the latter step is useful in a recovery scenario).
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   845
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   846
    public class RecoveryDeferredTypeMap extends DeferredTypeMap {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   847
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   848
        public RecoveryDeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) {
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   849
            super(mode, msym, phase != null ? phase : MethodResolutionPhase.BOX);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   850
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   851
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   852
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   853
        protected Type typeOf(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   854
            Type owntype = super.typeOf(dt);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   855
            return owntype == Type.noType ?
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   856
                        recover(dt) : owntype;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   857
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   858
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   859
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   860
         * Synthesize a type for a deferred type that hasn't been previously
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   861
         * reduced to an ordinary type. Functional deferred types and conditionals
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   862
         * are mapped to themselves, in order to have a richer diagnostic
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   863
         * representation. Remaining deferred types are attributed using
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   864
         * a default expected type (j.l.Object).
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   865
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   866
        private Type recover(DeferredType dt) {
18902
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   867
            dt.check(attr.new RecoveryInfo(deferredAttrContext) {
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   868
                @Override
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   869
                protected Type check(DiagnosticPosition pos, Type found) {
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   870
                    return chk.checkNonVoid(pos, super.check(pos, found));
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   871
                }
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   872
            });
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   873
            return super.apply(dt);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   874
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   875
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   876
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   877
    /**
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   878
     * A special tree scanner that would only visit portions of a given tree.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   879
     * The set of nodes visited by the scanner can be customized at construction-time.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   880
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   881
    abstract static class FilterScanner extends TreeScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   882
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   883
        final Filter<JCTree> treeFilter;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   884
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   885
        FilterScanner(final Set<JCTree.Tag> validTags) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   886
            this.treeFilter = new Filter<JCTree>() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   887
                public boolean accepts(JCTree t) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   888
                    return validTags.contains(t.getTag());
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   889
                }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   890
            };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   891
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   892
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   893
        @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   894
        public void scan(JCTree tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   895
            if (tree != null) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   896
                if (treeFilter.accepts(tree)) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   897
                    super.scan(tree);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   898
                } else {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   899
                    skip(tree);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   900
                }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   901
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   902
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   903
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   904
        /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   905
         * handler that is executed when a node has been discarded
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   906
         */
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   907
        void skip(JCTree tree) {}
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   908
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   909
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   910
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   911
     * A tree scanner suitable for visiting the target-type dependent nodes of
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   912
     * a given argument expression.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   913
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   914
    static class PolyScanner extends FilterScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   915
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   916
        PolyScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   917
            super(EnumSet.of(CONDEXPR, PARENS, LAMBDA, REFERENCE));
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   918
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   919
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   920
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   921
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   922
     * A tree scanner suitable for visiting the target-type dependent nodes nested
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   923
     * within a lambda expression body.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   924
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   925
    static class LambdaReturnScanner extends FilterScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   926
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   927
        LambdaReturnScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   928
            super(EnumSet.of(BLOCK, CASE, CATCH, DOLOOP, FOREACHLOOP,
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   929
                    FORLOOP, RETURN, SYNCHRONIZED, SWITCH, TRY, WHILELOOP));
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   930
        }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   931
    }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   932
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   933
    /**
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   934
     * This visitor is used to check that structural expressions conform
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   935
     * to their target - this step is required as inference could end up
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   936
     * inferring types that make some of the nested expressions incompatible
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   937
     * with their corresponding instantiated target
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   938
     */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   939
    class CheckStuckPolicy extends PolyScanner implements DeferredStuckPolicy, Infer.FreeTypeListener {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   940
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   941
        Type pt;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   942
        Infer.InferenceContext inferenceContext;
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   943
        Set<Type> stuckVars = new LinkedHashSet<>();
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   944
        Set<Type> depVars = new LinkedHashSet<>();
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   945
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   946
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   947
        public boolean isStuck() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   948
            return !stuckVars.isEmpty();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   949
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   950
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   951
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   952
        public Set<Type> stuckVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   953
            return stuckVars;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   954
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   955
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   956
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   957
        public Set<Type> depVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   958
            return depVars;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   959
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   960
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   961
        public CheckStuckPolicy(ResultInfo resultInfo, DeferredType dt) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   962
            this.pt = resultInfo.pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   963
            this.inferenceContext = resultInfo.checkContext.inferenceContext();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   964
            scan(dt.tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   965
            if (!stuckVars.isEmpty()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   966
                resultInfo.checkContext.inferenceContext()
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   967
                        .addFreeTypeListener(List.from(stuckVars), this);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   968
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   969
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   970
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   971
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   972
        public void typesInferred(InferenceContext inferenceContext) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   973
            stuckVars.clear();
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   974
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   975
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   976
        @Override
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   977
        public void visitLambda(JCLambda tree) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   978
            if (inferenceContext.inferenceVars().contains(pt)) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   979
                stuckVars.add(pt);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   980
            }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   981
            if (!types.isFunctionalInterface(pt)) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   982
                return;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   983
            }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   984
            Type descType = types.findDescriptorType(pt);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   985
            List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes());
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   986
            if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT &&
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   987
                    freeArgVars.nonEmpty()) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   988
                stuckVars.addAll(freeArgVars);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   989
                depVars.addAll(inferenceContext.freeVarsIn(descType.getReturnType()));
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   990
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   991
            scanLambdaBody(tree, descType.getReturnType());
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   992
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   993
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   994
        @Override
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   995
        public void visitReference(JCMemberReference tree) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   996
            scan(tree.expr);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   997
            if (inferenceContext.inferenceVars().contains(pt)) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   998
                stuckVars.add(pt);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   999
                return;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1000
            }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
  1001
            if (!types.isFunctionalInterface(pt)) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1002
                return;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1003
            }
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
  1004
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1005
            Type descType = types.findDescriptorType(pt);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1006
            List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes());
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1007
            if (freeArgVars.nonEmpty() &&
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1008
                    tree.overloadKind == JCMemberReference.OverloadKind.OVERLOADED) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1009
                stuckVars.addAll(freeArgVars);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1010
                depVars.addAll(inferenceContext.freeVarsIn(descType.getReturnType()));
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
  1011
            }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1012
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1013
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1014
        void scanLambdaBody(JCLambda lambda, final Type pt) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1015
            if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1016
                Type prevPt = this.pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1017
                try {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1018
                    this.pt = pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1019
                    scan(lambda.body);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1020
                } finally {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1021
                    this.pt = prevPt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1022
                }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1023
            } else {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1024
                LambdaReturnScanner lambdaScanner = new LambdaReturnScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1025
                    @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1026
                    public void visitReturn(JCReturn tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1027
                        if (tree.expr != null) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1028
                            Type prevPt = CheckStuckPolicy.this.pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1029
                            try {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1030
                                CheckStuckPolicy.this.pt = pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1031
                                CheckStuckPolicy.this.scan(tree.expr);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1032
                            } finally {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1033
                                CheckStuckPolicy.this.pt = prevPt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1034
                            }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1035
                        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1036
                    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1037
                };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1038
                lambdaScanner.scan(lambda.body);
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1039
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
  1040
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
  1041
    }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1042
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1043
    /**
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1044
     * This visitor is used to check that structural expressions conform
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1045
     * to their target - this step is required as inference could end up
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1046
     * inferring types that make some of the nested expressions incompatible
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1047
     * with their corresponding instantiated target
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1048
     */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1049
    class OverloadStuckPolicy extends CheckStuckPolicy implements DeferredStuckPolicy {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1050
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1051
        boolean stuck;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1052
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1053
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1054
        public boolean isStuck() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1055
            return super.isStuck() || stuck;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1056
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1057
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1058
        public OverloadStuckPolicy(ResultInfo resultInfo, DeferredType dt) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1059
            super(resultInfo, dt);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1060
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1061
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1062
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1063
        public void visitLambda(JCLambda tree) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1064
            super.visitLambda(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1065
            if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1066
                stuck = true;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1067
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1068
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1069
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1070
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1071
        public void visitReference(JCMemberReference tree) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1072
            super.visitReference(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1073
            if (tree.overloadKind == JCMemberReference.OverloadKind.OVERLOADED) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1074
                stuck = true;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1075
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1076
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1077
    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1078
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1079
    /**
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1080
     * Does the argument expression {@code expr} need speculative type-checking?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1081
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1082
    boolean isDeferred(Env<AttrContext> env, JCExpression expr) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1083
        DeferredChecker dc = new DeferredChecker(env);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1084
        dc.scan(expr);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1085
        return dc.result.isPoly();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1086
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1087
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1088
    /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1089
     * The kind of an argument expression. This is used by the analysis that
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1090
     * determines as to whether speculative attribution is necessary.
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1091
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1092
    enum ArgumentExpressionKind {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1093
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1094
        /** kind that denotes poly argument expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1095
        POLY,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1096
        /** kind that denotes a standalone expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1097
        NO_POLY,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1098
        /** kind that denotes a primitive/boxed standalone expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1099
        PRIMITIVE;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1100
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1101
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1102
         * Does this kind denote a poly argument expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1103
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1104
        public final boolean isPoly() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1105
            return this == POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1106
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1107
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1108
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1109
         * Does this kind denote a primitive standalone expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1110
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1111
        public final boolean isPrimitive() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1112
            return this == PRIMITIVE;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1113
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1114
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1115
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1116
         * Compute the kind of a standalone expression of a given type
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1117
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1118
        static ArgumentExpressionKind standaloneKind(Type type, Types types) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1119
            return types.unboxedTypeOrType(type).isPrimitive() ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1120
                    ArgumentExpressionKind.PRIMITIVE :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1121
                    ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1122
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1123
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1124
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1125
         * Compute the kind of a method argument expression given its symbol
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1126
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1127
        static ArgumentExpressionKind methodKind(Symbol sym, Types types) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1128
            Type restype = sym.type.getReturnType();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1129
            if (sym.type.hasTag(FORALL) &&
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1130
                    restype.containsAny(((ForAll)sym.type).tvars)) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1131
                return ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1132
            } else {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1133
                return ArgumentExpressionKind.standaloneKind(restype, types);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1134
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1135
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1136
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1137
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1138
    /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1139
     * Tree scanner used for checking as to whether an argument expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1140
     * requires speculative attribution
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1141
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1142
    final class DeferredChecker extends FilterScanner {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1143
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1144
        Env<AttrContext> env;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1145
        ArgumentExpressionKind result;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1146
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1147
        public DeferredChecker(Env<AttrContext> env) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1148
            super(deferredCheckerTags);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1149
            this.env = env;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1150
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1151
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1152
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1153
        public void visitLambda(JCLambda tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1154
            //a lambda is always a poly expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1155
            result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1156
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1157
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1158
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1159
        public void visitReference(JCMemberReference tree) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1160
            //perform arity-based check
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1161
            Env<AttrContext> localEnv = env.dup(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1162
            JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), localEnv,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1163
                    attr.memberReferenceQualifierResult(tree));
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1164
            JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1165
            mref2.expr = exprTree;
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1166
            Symbol res =
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1167
                    rs.getMemberReference(tree, localEnv, mref2,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1168
                        exprTree.type, tree.name);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1169
            tree.sym = res;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1170
            if (res.kind >= Kinds.ERRONEOUS ||
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1171
                    res.type.hasTag(FORALL) ||
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1172
                    (res.flags() & Flags.VARARGS) != 0 ||
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1173
                    (TreeInfo.isStaticSelector(exprTree, tree.name.table.names) &&
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1174
                    exprTree.type.isRaw())) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1175
                tree.overloadKind = JCMemberReference.OverloadKind.OVERLOADED;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1176
            } else {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1177
                tree.overloadKind = JCMemberReference.OverloadKind.UNOVERLOADED;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1178
            }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1179
            //a method reference is always a poly expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1180
            result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1181
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1182
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1183
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1184
        public void visitTypeCast(JCTypeCast tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1185
            //a cast is always a standalone expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1186
            result = ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1187
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1188
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1189
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1190
        public void visitConditional(JCConditional tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1191
            scan(tree.truepart);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1192
            if (!result.isPrimitive()) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1193
                result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1194
                return;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1195
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1196
            scan(tree.falsepart);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1197
            result = reduce(ArgumentExpressionKind.PRIMITIVE);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1198
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1199
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1200
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1201
        public void visitNewClass(JCNewClass tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1202
            result = (TreeInfo.isDiamond(tree) || attr.findDiamonds) ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1203
                    ArgumentExpressionKind.POLY : ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1204
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1205
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1206
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1207
        public void visitApply(JCMethodInvocation tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1208
            Name name = TreeInfo.name(tree.meth);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1209
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1210
            //fast path
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1211
            if (tree.typeargs.nonEmpty() ||
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1212
                    name == name.table.names._this ||
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1213
                    name == name.table.names._super) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1214
                result = ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1215
                return;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1216
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1217
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1218
            //slow path
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1219
            final JCExpression rec = tree.meth.hasTag(SELECT) ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1220
                    ((JCFieldAccess)tree.meth).selected :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1221
                    null;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1222
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1223
            if (rec != null && !isSimpleReceiver(rec)) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1224
                //give up if receiver is too complex (to cut down analysis time)
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1225
                result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1226
                return;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1227
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1228
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1229
            Type site = rec != null ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1230
                    attribSpeculative(rec, env, attr.unknownTypeExprInfo).type :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1231
                    env.enclClass.sym.type;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1232
18901
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
  1233
            while (site.hasTag(TYPEVAR)) {
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
  1234
                site = site.getUpperBound();
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
  1235
            }
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
  1236
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
  1237
            List<Type> args = rs.dummyArgs(tree.args.length());
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1238
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
  1239
            Resolve.LookupHelper lh = rs.new LookupHelper(name, site, args, List.<Type>nil(), MethodResolutionPhase.VARARITY) {
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1240
                @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1241
                Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1242
                    return rec == null ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1243
                        rs.findFun(env, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1244
                        rs.findMethod(env, site, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired(), false);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1245
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1246
                @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1247
                Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1248
                    return sym;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1249
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1250
            };
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1251
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1252
            Symbol sym = rs.lookupMethod(env, tree, site.tsym, rs.arityMethodCheck, lh);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1253
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1254
            if (sym.kind == Kinds.AMBIGUOUS) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1255
                Resolve.AmbiguityError err = (Resolve.AmbiguityError)sym.baseSymbol();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1256
                result = ArgumentExpressionKind.PRIMITIVE;
18643
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 16975
diff changeset
  1257
                for (Symbol s : err.ambiguousSyms) {
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 16975
diff changeset
  1258
                    if (result.isPoly()) break;
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1259
                    if (s.kind == Kinds.MTH) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1260
                        result = reduce(ArgumentExpressionKind.methodKind(s, types));
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1261
                    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1262
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1263
            } else {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1264
                result = (sym.kind == Kinds.MTH) ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1265
                    ArgumentExpressionKind.methodKind(sym, types) :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1266
                    ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1267
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1268
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1269
        //where
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1270
            private boolean isSimpleReceiver(JCTree rec) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1271
                switch (rec.getTag()) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1272
                    case IDENT:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1273
                        return true;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1274
                    case SELECT:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1275
                        return isSimpleReceiver(((JCFieldAccess)rec).selected);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1276
                    case TYPEAPPLY:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1277
                    case TYPEARRAY:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1278
                        return true;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1279
                    case ANNOTATED_TYPE:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1280
                        return isSimpleReceiver(((JCAnnotatedType)rec).underlyingType);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1281
                    default:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1282
                        return false;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1283
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1284
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1285
            private ArgumentExpressionKind reduce(ArgumentExpressionKind kind) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1286
                switch (result) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1287
                    case PRIMITIVE: return kind;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1288
                    case NO_POLY: return kind.isPoly() ? kind : result;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1289
                    case POLY: return result;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1290
                    default:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1291
                        Assert.error();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1292
                        return null;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1293
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1294
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1295
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1296
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1297
        public void visitLiteral(JCLiteral tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1298
            Type litType = attr.litType(tree.typetag);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1299
            result = ArgumentExpressionKind.standaloneKind(litType, types);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1300
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1301
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1302
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1303
        void skip(JCTree tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1304
            result = ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1305
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1306
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1307
    //where
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1308
    private EnumSet<JCTree.Tag> deferredCheckerTags =
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1309
            EnumSet.of(LAMBDA, REFERENCE, PARENS, TYPECAST,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1310
                    CONDEXPR, NEWCLASS, APPLY, LITERAL);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
  1311
}