langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
author sadayapalam
Mon, 11 May 2015 13:28:14 +0530
changeset 30728 f0c022c5290c
parent 29842 826ac2519523
child 31937 ad43a6639c4a
permissions -rw-r--r--
8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times. Summary: Eliminate compile time performance bottlneck due to mischaracterization of standalone expressions as being poly expressions. Reviewed-by: mcimadamore, jlahoda
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
/*
28891
dc7d89f2e25c 8069545: javac shouldn't check nested stuck lambdas during overload resolution
sadayapalam
parents: 28458
diff changeset
     2
 * Copyright (c) 2012, 2015, 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;
29776
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
    29
import com.sun.source.tree.NewClassTree;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    30
import com.sun.tools.javac.code.*;
29554
6d7957bd6866 8074100: Turn Type.Mapping into a true visitor
mcimadamore
parents: 29292
diff changeset
    31
import com.sun.tools.javac.code.Type.TypeMapping;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
    32
import com.sun.tools.javac.comp.Resolve.ResolveError;
28458
f20c5dd05e34 8069164: Fix langtools make build so that diagnostic framework can be used
mcimadamore
parents: 28457
diff changeset
    33
import com.sun.tools.javac.resources.CompilerProperties.Fragments;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    34
import com.sun.tools.javac.tree.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    35
import com.sun.tools.javac.util.*;
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
    36
import com.sun.tools.javac.util.DefinedBy.Api;
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16566
diff changeset
    37
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    38
import com.sun.tools.javac.code.Symbol.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    39
import com.sun.tools.javac.code.Type.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    40
import com.sun.tools.javac.comp.Attr.ResultInfo;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    41
import com.sun.tools.javac.comp.Infer.InferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    42
import com.sun.tools.javac.comp.Resolve.MethodResolutionPhase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    43
import com.sun.tools.javac.tree.JCTree.*;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
    44
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
28142
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
    45
import com.sun.tools.javac.util.Log.DeferredDiagnosticHandler;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    46
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    47
import java.util.ArrayList;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
    48
import java.util.Collections;
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
    49
import java.util.EnumSet;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
    50
import java.util.LinkedHashMap;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
    51
import java.util.LinkedHashSet;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    52
import java.util.Map;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    53
import java.util.Set;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    54
import java.util.WeakHashMap;
28142
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
    55
import java.util.function.Function;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    56
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
    57
import static com.sun.tools.javac.code.TypeTag.*;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    58
import static com.sun.tools.javac.tree.JCTree.Tag.*;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
    59
import static com.sun.tools.javac.code.Kinds.*;
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
    60
import static com.sun.tools.javac.code.Kinds.Kind.*;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    61
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    62
/**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    63
 * 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
    64
 * 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
    65
 * with a temporary 'deferred type' that is checked (possibly multiple times)
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    66
 * against an expected formal type.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    67
 *
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    68
 *  <p><b>This is NOT part of any supported API.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    69
 *  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
    70
 *  This code and its internal interfaces are subject to change or
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    71
 *  deletion without notice.</b>
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    72
 */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    73
public class DeferredAttr extends JCTree.Visitor {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
    74
    protected static final Context.Key<DeferredAttr> deferredAttrKey = new Context.Key<>();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    75
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    76
    final Attr attr;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    77
    final Check chk;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
    78
    final JCDiagnostic.Factory diags;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    79
    final Enter enter;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    80
    final Infer infer;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
    81
    final Resolve rs;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    82
    final Log log;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    83
    final Symtab syms;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    84
    final TreeMaker make;
29776
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
    85
    final TreeCopier<Void> treeCopier;
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
    86
    final TypeMapping<Void> deferredCopier;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    87
    final Types types;
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
    88
    final Flow flow;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
    89
    final Names names;
25007
eb097d3a68f5 8038975: Access control in enhanced for
pgovereau
parents: 24895
diff changeset
    90
    final TypeEnvs typeEnvs;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    91
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    92
    public static DeferredAttr instance(Context context) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    93
        DeferredAttr instance = context.get(deferredAttrKey);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    94
        if (instance == null)
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    95
            instance = new DeferredAttr(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    96
        return instance;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    97
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    98
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    99
    protected DeferredAttr(Context context) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   100
        context.put(deferredAttrKey, this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   101
        attr = Attr.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   102
        chk = Check.instance(context);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   103
        diags = JCDiagnostic.Factory.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   104
        enter = Enter.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   105
        infer = Infer.instance(context);
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   106
        rs = Resolve.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   107
        log = Log.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   108
        syms = Symtab.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   109
        make = TreeMaker.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   110
        types = Types.instance(context);
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   111
        flow = Flow.instance(context);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   112
        names = Names.instance(context);
18902
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   113
        stuckTree = make.Ident(names.empty).setType(Type.stuckType);
25007
eb097d3a68f5 8038975: Access control in enhanced for
pgovereau
parents: 24895
diff changeset
   114
        typeEnvs = TypeEnvs.instance(context);
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   115
        emptyDeferredAttrContext =
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   116
            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
   117
                @Override
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   118
                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
   119
                    Assert.error("Empty deferred context!");
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   120
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   121
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   122
                void complete() {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   123
                    Assert.error("Empty deferred context!");
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   124
                }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   125
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   126
                @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   127
                public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   128
                    return "Empty deferred context!";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 24066
diff changeset
   129
                }
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   130
            };
29776
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   131
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   132
        // For speculative attribution, skip the class definition in <>.
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   133
        treeCopier =
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   134
            new TreeCopier<Void>(make) {
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   135
                @Override @DefinedBy(Api.COMPILER_TREE)
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   136
                public JCTree visitNewClass(NewClassTree node, Void p) {
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   137
                    JCNewClass t = (JCNewClass) node;
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   138
                    if (TreeInfo.isDiamond(t)) {
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   139
                        JCExpression encl = copy(t.encl, p);
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   140
                        List<JCExpression> typeargs = copy(t.typeargs, p);
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   141
                        JCExpression clazz = copy(t.clazz, p);
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   142
                        List<JCExpression> args = copy(t.args, p);
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   143
                        JCClassDecl def = null;
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   144
                        return make.at(t.pos).NewClass(encl, typeargs, clazz, args, def);
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   145
                    } else {
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   146
                        return super.visitNewClass(node, p);
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   147
                    }
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   148
                }
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   149
            };
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   150
        deferredCopier = new TypeMapping<Void> () {
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   151
                @Override
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   152
                public Type visitType(Type t, Void v) {
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   153
                    if (t.hasTag(DEFERRED)) {
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   154
                        DeferredType dt = (DeferredType) t;
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   155
                        return new DeferredType(treeCopier.copy(dt.tree), dt.env);
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   156
                    }
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   157
                    return t;
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   158
                }
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   159
            };
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   160
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   161
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   162
    /** shared tree for stuck expressions */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   163
    final JCTree stuckTree;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   164
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   165
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   166
     * 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
   167
     * 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
   168
     * discovered through type-checking the deferred type against a target-type.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   169
     * 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
   170
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   171
    public class DeferredType extends Type {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   172
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   173
        public JCExpression tree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   174
        Env<AttrContext> env;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   175
        AttrMode mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   176
        SpeculativeCache speculativeCache;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   177
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
   178
        DeferredType(JCExpression tree, Env<AttrContext> env) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29776
diff changeset
   179
            super(null, TypeMetadata.EMPTY);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   180
            this.tree = tree;
18912
e25cd61d8e59 8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents: 18910
diff changeset
   181
            this.env = attr.copyEnv(env);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   182
            this.speculativeCache = new SpeculativeCache();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   183
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   184
18646
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   185
        @Override
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29776
diff changeset
   186
        public DeferredType cloneWithMetadata(TypeMetadata md) {
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   187
            throw new AssertionError("Cannot add metadata to a deferred type");
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24226
diff changeset
   188
        }
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24226
diff changeset
   189
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24226
diff changeset
   190
        @Override
18646
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   191
        public TypeTag getTag() {
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   192
            return DEFERRED;
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   193
        }
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   194
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
   195
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   196
        public String toString() {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   197
            return "DeferredType";
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   198
        }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   199
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   200
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   201
         * 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
   202
         * that triggered speculative attribution on a given deferred type. Each entry
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   203
         * 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
   204
         * has been added.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   205
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   206
        class SpeculativeCache {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   207
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   208
            private Map<Symbol, List<Entry>> cache = new WeakHashMap<>();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   209
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   210
            class Entry {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   211
                JCTree speculativeTree;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   212
                ResultInfo resultInfo;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   213
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   214
                public Entry(JCTree speculativeTree, ResultInfo resultInfo) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   215
                    this.speculativeTree = speculativeTree;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   216
                    this.resultInfo = resultInfo;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   217
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   218
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   219
                boolean matches(MethodResolutionPhase phase) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   220
                    return resultInfo.checkContext.deferredAttrContext().phase == phase;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   221
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   222
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   223
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   224
            /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   225
             * Retrieve a speculative cache entry corresponding to given symbol
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   226
             * and resolution phase
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   227
             */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   228
            Entry get(Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   229
                List<Entry> entries = cache.get(msym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   230
                if (entries == null) return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   231
                for (Entry e : entries) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   232
                    if (e.matches(phase)) return e;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   233
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   234
                return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   235
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   236
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   237
            /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   238
             * Stores a speculative cache entry corresponding to given symbol
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   239
             * and resolution phase
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   240
             */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   241
            void put(JCTree speculativeTree, ResultInfo resultInfo) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   242
                Symbol msym = resultInfo.checkContext.deferredAttrContext().msym;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   243
                List<Entry> entries = cache.get(msym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   244
                if (entries == null) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   245
                    entries = List.nil();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   246
                }
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   247
                cache.put(msym, entries.prepend(new Entry(speculativeTree, resultInfo)));
14057
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
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   250
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   251
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   252
         * 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
   253
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   254
        Type speculativeType(Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   255
            SpeculativeCache.Entry e = speculativeCache.get(msym, phase);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   256
            return e != null ? e.speculativeTree.type : Type.noType;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   257
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   258
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   259
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   260
         * Check a deferred type against a potential target-type. Depending on
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   261
         * the current attribution mode, a normal vs. speculative attribution
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   262
         * 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
   263
         * speculative round for a given target method symbol; moreover, a normal
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   264
         * attribution round must follow one or more speculative rounds.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   265
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   266
        Type check(ResultInfo resultInfo) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   267
            DeferredStuckPolicy deferredStuckPolicy;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   268
            if (resultInfo.pt.hasTag(NONE) || resultInfo.pt.isErroneous()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   269
                deferredStuckPolicy = dummyStuckPolicy;
28891
dc7d89f2e25c 8069545: javac shouldn't check nested stuck lambdas during overload resolution
sadayapalam
parents: 28458
diff changeset
   270
            } else if (resultInfo.checkContext.deferredAttrContext().mode == AttrMode.SPECULATIVE ||
dc7d89f2e25c 8069545: javac shouldn't check nested stuck lambdas during overload resolution
sadayapalam
parents: 28458
diff changeset
   271
                    resultInfo.checkContext.deferredAttrContext().insideOverloadPhase()) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   272
                deferredStuckPolicy = new OverloadStuckPolicy(resultInfo, this);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   273
            } else {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   274
                deferredStuckPolicy = new CheckStuckPolicy(resultInfo, this);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   275
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   276
            return check(resultInfo, deferredStuckPolicy, basicCompleter);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   277
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   278
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   279
        private Type check(ResultInfo resultInfo, DeferredStuckPolicy deferredStuckPolicy,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   280
                DeferredTypeCompleter deferredTypeCompleter) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   281
            DeferredAttrContext deferredAttrContext =
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   282
                    resultInfo.checkContext.deferredAttrContext();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   283
            Assert.check(deferredAttrContext != emptyDeferredAttrContext);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   284
            if (deferredStuckPolicy.isStuck()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   285
                deferredAttrContext.addDeferredAttrNode(this, resultInfo, deferredStuckPolicy);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   286
                return Type.noType;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   287
            } else {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   288
                try {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   289
                    return deferredTypeCompleter.complete(this, resultInfo, deferredAttrContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   290
                } finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   291
                    mode = deferredAttrContext.mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   292
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   293
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   294
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   295
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   296
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   297
    /**
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   298
     * 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
   299
     * a deferred type.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   300
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   301
    interface DeferredTypeCompleter {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   302
        /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   303
         * 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
   304
         * circumstances, type-checking could amount to full attribution
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   305
         * or partial structural check (aka potential applicability).
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   306
         */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   307
        Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   308
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   309
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   310
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   311
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   312
     * 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
   313
     * 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
   314
     * or speculative attribution.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   315
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   316
    DeferredTypeCompleter basicCompleter = new DeferredTypeCompleter() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   317
        public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   318
            switch (deferredAttrContext.mode) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   319
                case SPECULATIVE:
16566
604ce45d5f23 8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents: 16326
diff changeset
   320
                    //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
   321
                    //speculative rounds...
604ce45d5f23 8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents: 16326
diff changeset
   322
                    Assert.check(dt.mode == null || dt.mode == AttrMode.SPECULATIVE);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
   323
                    JCTree speculativeTree = attribSpeculative(dt.tree, dt.env, resultInfo);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   324
                    dt.speculativeCache.put(speculativeTree, resultInfo);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   325
                    return speculativeTree.type;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   326
                case CHECK:
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   327
                    Assert.check(dt.mode != null);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
   328
                    return attr.attribTree(dt.tree, dt.env, resultInfo);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   329
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   330
            Assert.error();
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   331
            return null;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   332
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   333
    };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   334
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   335
    /**
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   336
     * Policy for detecting stuck expressions. Different criteria might cause
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   337
     * an expression to be judged as stuck, depending on whether the check
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   338
     * is performed during overload resolution or after most specific.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   339
     */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   340
    interface DeferredStuckPolicy {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   341
        /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   342
         * Has the policy detected that a given expression should be considered stuck?
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   343
         */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   344
        boolean isStuck();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   345
        /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   346
         * Get the set of inference variables a given expression depends upon.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   347
         */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   348
        Set<Type> stuckVars();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   349
        /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   350
         * Get the set of inference variables which might get new constraints
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   351
         * if a given expression is being type-checked.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   352
         */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   353
        Set<Type> depVars();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   354
    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   355
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   356
    /**
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   357
     * Basic stuck policy; an expression is never considered to be stuck.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   358
     */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   359
    DeferredStuckPolicy dummyStuckPolicy = new DeferredStuckPolicy() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   360
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   361
        public boolean isStuck() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   362
            return false;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   363
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   364
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   365
        public Set<Type> stuckVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   366
            return Collections.emptySet();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   367
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   368
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   369
        public Set<Type> depVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   370
            return Collections.emptySet();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   371
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   372
    };
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   373
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   374
    /**
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   375
     * 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
   376
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   377
    public enum AttrMode {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   378
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   379
         * A speculative type-checking round is used during overload resolution
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   380
         * mainly to generate constraints on inference variables. Side-effects
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   381
         * arising from type-checking the expression associated with the deferred
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   382
         * type are reversed after the speculative round finishes. This means the
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   383
         * expression tree will be left in a blank state.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   384
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   385
        SPECULATIVE,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   386
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   387
         * 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
   388
         */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   389
        CHECK
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   390
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   391
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   392
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   393
     * Routine that performs speculative type-checking; the input AST node is
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   394
     * 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
   395
     * restored after type-checking. All diagnostics (but critical ones) are
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   396
     * disabled during speculative type-checking.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   397
     */
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
   398
    JCTree attribSpeculative(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) {
29776
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
   399
        return attribSpeculative(tree, env, resultInfo, treeCopier,
28142
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   400
                (newTree)->new DeferredAttrDiagHandler(log, newTree));
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   401
    }
16309
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   402
28142
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   403
    <Z> JCTree attribSpeculative(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo, TreeCopier<Z> deferredCopier,
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   404
                                 Function<JCTree, DeferredDiagnosticHandler> diagHandlerCreator) {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   405
        final JCTree newTree = deferredCopier.copy(tree);
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   406
        Env<AttrContext> speculativeEnv = env.dup(newTree, env.info.dup(env.info.scope.dupUnshared(env.info.scope.owner)));
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   407
        speculativeEnv.info.isSpeculative = true;
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   408
        Log.DeferredDiagnosticHandler deferredDiagnosticHandler = diagHandlerCreator.apply(newTree);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   409
        try {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   410
            attr.attribTree(newTree, speculativeEnv, resultInfo);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   411
            unenterScanner.scan(newTree);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   412
            return newTree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   413
        } finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   414
            unenterScanner.scan(newTree);
14538
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   415
            log.popDiagnosticHandler(deferredDiagnosticHandler);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   416
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   417
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   418
    //where
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   419
        protected UnenterScanner unenterScanner = new UnenterScanner();
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   420
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   421
        class UnenterScanner extends TreeScanner {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   422
            @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   423
            public void visitClassDef(JCClassDecl tree) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   424
                ClassSymbol csym = tree.sym;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   425
                //if something went wrong during method applicability check
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   426
                //it is possible that nested expressions inside argument expression
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   427
                //are left unchecked - in such cases there's nothing to clean up.
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   428
                if (csym == null) return;
25007
eb097d3a68f5 8038975: Access control in enhanced for
pgovereau
parents: 24895
diff changeset
   429
                typeEnvs.remove(csym);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   430
                chk.compiled.remove(csym.flatname);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   431
                syms.classes.remove(csym.flatname);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   432
                super.visitClassDef(tree);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   433
            }
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   434
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   435
28142
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   436
        static class DeferredAttrDiagHandler extends Log.DeferredDiagnosticHandler {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   437
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   438
            static class PosScanner extends TreeScanner {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   439
                DiagnosticPosition pos;
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   440
                boolean found = false;
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   441
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   442
                PosScanner(DiagnosticPosition pos) {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   443
                    this.pos = pos;
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   444
                }
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   445
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   446
                @Override
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   447
                public void scan(JCTree tree) {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   448
                    if (tree != null &&
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   449
                            tree.pos() == pos) {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   450
                        found = true;
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   451
                    }
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   452
                    super.scan(tree);
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   453
                }
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   454
            }
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   455
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   456
            DeferredAttrDiagHandler(Log log, JCTree newTree) {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   457
                super(log, new Filter<JCDiagnostic>() {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   458
                    public boolean accepts(JCDiagnostic d) {
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   459
                        PosScanner posScanner = new PosScanner(d.getDiagnosticPosition());
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   460
                        posScanner.scan(newTree);
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   461
                        return posScanner.found;
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   462
                    }
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   463
                });
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   464
            }
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   465
        }
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
   466
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   467
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   468
     * 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
   469
     * 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
   470
     * the symbol of the method being checked, the overload resolution phase,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   471
     * 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
   472
     * 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
   473
     * 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
   474
     * routine makes sure that all pending nodes are properly processed, by
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   475
     * progressively instantiating all inference variables on which one or more
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   476
     * deferred attribution node is stuck.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   477
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   478
    class DeferredAttrContext {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   479
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   480
        /** attribution mode */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   481
        final AttrMode mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   482
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   483
        /** symbol of the method being checked */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   484
        final Symbol msym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   485
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   486
        /** method resolution step */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   487
        final Resolve.MethodResolutionPhase phase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   488
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   489
        /** inference context */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   490
        final InferenceContext inferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   491
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   492
        /** parent deferred context */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   493
        final DeferredAttrContext parent;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   494
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   495
        /** Warner object to report warnings */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   496
        final Warner warn;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   497
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   498
        /** list of deferred attribution nodes to be processed */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   499
        ArrayList<DeferredAttrNode> deferredAttrNodes = new ArrayList<>();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   500
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   501
        DeferredAttrContext(AttrMode mode, Symbol msym, MethodResolutionPhase phase,
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   502
                InferenceContext inferenceContext, DeferredAttrContext parent, Warner warn) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   503
            this.mode = mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   504
            this.msym = msym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   505
            this.phase = phase;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   506
            this.parent = parent;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   507
            this.warn = warn;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   508
            this.inferenceContext = inferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   509
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   510
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   511
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   512
         * 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
   513
         * 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
   514
         */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   515
        void addDeferredAttrNode(final DeferredType dt, ResultInfo resultInfo,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   516
                DeferredStuckPolicy deferredStuckPolicy) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   517
            deferredAttrNodes.add(new DeferredAttrNode(dt, resultInfo, deferredStuckPolicy));
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   518
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   519
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   520
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   521
         * Incrementally process all nodes, by skipping 'stuck' nodes and attributing
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   522
         * '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
   523
         * some inference variable might get eagerly instantiated so that all nodes
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   524
         * can be type-checked.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   525
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   526
        void complete() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   527
            while (!deferredAttrNodes.isEmpty()) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   528
                Map<Type, Set<Type>> depVarsMap = new LinkedHashMap<>();
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   529
                List<Type> stuckVars = List.nil();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   530
                boolean progress = false;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   531
                //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
   532
                //attribution round can add new nodes to the list
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   533
                for (DeferredAttrNode deferredAttrNode : List.from(deferredAttrNodes)) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   534
                    if (!deferredAttrNode.process(this)) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   535
                        List<Type> restStuckVars =
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   536
                                List.from(deferredAttrNode.deferredStuckPolicy.stuckVars())
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   537
                                .intersect(inferenceContext.restvars());
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   538
                        stuckVars = stuckVars.prependList(restStuckVars);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   539
                        //update dependency map
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   540
                        for (Type t : List.from(deferredAttrNode.deferredStuckPolicy.depVars())
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   541
                                .intersect(inferenceContext.restvars())) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   542
                            Set<Type> prevDeps = depVarsMap.get(t);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   543
                            if (prevDeps == null) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
   544
                                prevDeps = new LinkedHashSet<>();
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   545
                                depVarsMap.put(t, prevDeps);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   546
                            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   547
                            prevDeps.addAll(restStuckVars);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   548
                        }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   549
                    } else {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   550
                        deferredAttrNodes.remove(deferredAttrNode);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   551
                        progress = true;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   552
                    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   553
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   554
                if (!progress) {
25444
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   555
                    if (insideOverloadPhase()) {
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   556
                        for (DeferredAttrNode deferredNode: deferredAttrNodes) {
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   557
                            deferredNode.dt.tree.type = Type.noType;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   558
                        }
25444
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   559
                        return;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   560
                    }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   561
                    //remove all variables that have already been instantiated
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   562
                    //from the list of stuck variables
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   563
                    try {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   564
                        inferenceContext.solveAny(stuckVars, depVarsMap, warn);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   565
                        inferenceContext.notifyChange();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   566
                    } catch (Infer.GraphStrategy.NodeNotFoundException ex) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   567
                        //this means that we are in speculative mode and the
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   568
                        //set of contraints are too tight for progess to be made.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   569
                        //Just leave the remaining expressions as stuck.
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   570
                        break;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   571
                    }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   572
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   573
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   574
        }
25444
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   575
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   576
        private boolean insideOverloadPhase() {
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   577
            DeferredAttrContext dac = this;
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   578
            if (dac == emptyDeferredAttrContext) {
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   579
                return false;
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   580
            }
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   581
            if (dac.mode == AttrMode.SPECULATIVE) {
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   582
                return true;
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   583
            }
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   584
            return dac.parent.insideOverloadPhase();
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   585
        }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   586
    }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   587
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
     * 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
   590
     * 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
   591
     */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   592
    class DeferredAttrNode {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   593
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   594
        /** underlying deferred type */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   595
        DeferredType dt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   596
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   597
        /** underlying target type information */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   598
        ResultInfo resultInfo;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   599
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   600
        /** stuck policy associated with this node */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   601
        DeferredStuckPolicy deferredStuckPolicy;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   602
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   603
        DeferredAttrNode(DeferredType dt, ResultInfo resultInfo, DeferredStuckPolicy deferredStuckPolicy) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   604
            this.dt = dt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   605
            this.resultInfo = resultInfo;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   606
            this.deferredStuckPolicy = deferredStuckPolicy;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   607
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   608
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   609
        /**
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   610
         * Process a deferred attribution node.
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   611
         * Invariant: a stuck node cannot be processed.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   612
         */
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   613
        @SuppressWarnings("fallthrough")
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   614
        boolean process(final DeferredAttrContext deferredAttrContext) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   615
            switch (deferredAttrContext.mode) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   616
                case SPECULATIVE:
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   617
                    if (deferredStuckPolicy.isStuck()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   618
                        dt.check(resultInfo, dummyStuckPolicy, new StructuralStuckChecker());
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   619
                        return true;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   620
                    } else {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   621
                        Assert.error("Cannot get here");
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   622
                    }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   623
                case CHECK:
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   624
                    if (deferredStuckPolicy.isStuck()) {
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   625
                        //stuck expression - see if we can propagate
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   626
                        if (deferredAttrContext.parent != emptyDeferredAttrContext &&
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   627
                                Type.containsAny(deferredAttrContext.parent.inferenceContext.inferencevars,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   628
                                        List.from(deferredStuckPolicy.stuckVars()))) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   629
                            deferredAttrContext.parent.addDeferredAttrNode(dt,
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   630
                                    resultInfo.dup(new Check.NestedCheckContext(resultInfo.checkContext) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   631
                                @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   632
                                public InferenceContext inferenceContext() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   633
                                    return deferredAttrContext.parent.inferenceContext;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   634
                                }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   635
                                @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   636
                                public DeferredAttrContext deferredAttrContext() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   637
                                    return deferredAttrContext.parent;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   638
                                }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   639
                            }), deferredStuckPolicy);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   640
                            dt.tree.type = Type.stuckType;
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   641
                            return true;
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   642
                        } else {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   643
                            return false;
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   644
                        }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   645
                    } else {
25444
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   646
                        Assert.check(!deferredAttrContext.insideOverloadPhase(),
27045478cf23 8033483: Should ignore nested lambda bodies during overload resolution
vromero
parents: 25443
diff changeset
   647
                                "attribution shouldn't be happening here");
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   648
                        ResultInfo instResultInfo =
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   649
                                resultInfo.dup(deferredAttrContext.inferenceContext.asInstType(resultInfo.pt));
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   650
                        dt.check(instResultInfo, dummyStuckPolicy, basicCompleter);
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   651
                        return true;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   652
                    }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   653
                default:
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   654
                    throw new AssertionError("Bad mode");
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   655
            }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   656
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   657
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   658
        /**
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   659
         * Structural checker for stuck expressions
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   660
         */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   661
        class StructuralStuckChecker extends TreeScanner implements DeferredTypeCompleter {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   662
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   663
            ResultInfo resultInfo;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   664
            InferenceContext inferenceContext;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   665
            Env<AttrContext> env;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   666
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   667
            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
   668
                this.resultInfo = resultInfo;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   669
                this.inferenceContext = deferredAttrContext.inferenceContext;
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   670
                this.env = dt.env;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   671
                dt.tree.accept(this);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   672
                dt.speculativeCache.put(stuckTree, resultInfo);
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   673
                return Type.noType;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   674
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   675
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   676
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   677
            public void visitLambda(JCLambda tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   678
                Check.CheckContext checkContext = resultInfo.checkContext;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   679
                Type pt = resultInfo.pt;
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   680
                if (!inferenceContext.inferencevars.contains(pt)) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   681
                    //must be a functional descriptor
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   682
                    Type descriptorType = null;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   683
                    try {
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   684
                        descriptorType = types.findDescriptorType(pt);
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   685
                    } catch (Types.FunctionDescriptorLookupError ex) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   686
                        checkContext.report(null, ex.getDiagnostic());
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   687
                    }
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   688
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   689
                    if (descriptorType.getParameterTypes().length() != tree.params.length()) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   690
                        checkContext.report(tree,
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   691
                                diags.fragment("incompatible.arg.types.in.lambda"));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   692
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   693
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   694
                    Type currentReturnType = descriptorType.getReturnType();
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   695
                    boolean returnTypeIsVoid = currentReturnType.hasTag(VOID);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   696
                    if (tree.getBodyKind() == BodyKind.EXPRESSION) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   697
                        boolean isExpressionCompatible = !returnTypeIsVoid ||
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   698
                            TreeInfo.isExpressionStatement((JCExpression)tree.getBody());
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   699
                        if (!isExpressionCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   700
                            resultInfo.checkContext.report(tree.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   701
                                diags.fragment("incompatible.ret.type.in.lambda",
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   702
                                    diags.fragment("missing.ret.val", currentReturnType)));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   703
                        }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   704
                    } else {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   705
                        LambdaBodyStructChecker lambdaBodyChecker =
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   706
                                new LambdaBodyStructChecker();
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   707
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   708
                        tree.body.accept(lambdaBodyChecker);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   709
                        boolean isVoidCompatible = lambdaBodyChecker.isVoidCompatible;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   710
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   711
                        if (returnTypeIsVoid) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   712
                            if (!isVoidCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   713
                                resultInfo.checkContext.report(tree.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   714
                                    diags.fragment("unexpected.ret.val"));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   715
                            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   716
                        } else {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   717
                            boolean isValueCompatible = lambdaBodyChecker.isPotentiallyValueCompatible
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   718
                                && !canLambdaBodyCompleteNormally(tree);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   719
                            if (!isValueCompatible && !isVoidCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   720
                                log.error(tree.body.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   721
                                    "lambda.body.neither.value.nor.void.compatible");
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   722
                            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   723
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   724
                            if (!isValueCompatible) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   725
                                resultInfo.checkContext.report(tree.pos(),
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   726
                                    diags.fragment("incompatible.ret.type.in.lambda",
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   727
                                        diags.fragment("missing.ret.val", currentReturnType)));
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   728
                            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   729
                        }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   730
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   731
                }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   732
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   733
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   734
            boolean canLambdaBodyCompleteNormally(JCLambda tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   735
                JCLambda newTree = new TreeCopier<>(make).copy(tree);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   736
                /* 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
   737
                 * 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
   738
                 * 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
   739
                 * remove any added symbol.
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   740
                 */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   741
                Env<AttrContext> localEnv = attr.lambdaEnv(newTree, env);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   742
                try {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   743
                    List<JCVariableDecl> tmpParams = newTree.params;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   744
                    while (tmpParams.nonEmpty()) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   745
                        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
   746
                        tmpParams = tmpParams.tail;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   747
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   748
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   749
                    attr.attribStats(newTree.params, localEnv);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   750
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   751
                    /* 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
   752
                     * 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
   753
                     * inference variable
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   754
                     */
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
   755
                    Attr.ResultInfo bodyResultInfo = attr.new ResultInfo(KindSelector.VAL, Type.noType);
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   756
                    localEnv.info.returnResult = bodyResultInfo;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   757
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   758
                    // discard any log output
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   759
                    Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   760
                    try {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   761
                        JCBlock body = (JCBlock)newTree.body;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   762
                        /* 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
   763
                         * doing the aliveness analysis. This is because
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   764
                         * constant folding occurs during attribution
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   765
                         * and the reachability of some statements depends
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   766
                         * on constant values, for example:
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
                         *     while (true) {...}
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   769
                         */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   770
                        attr.attribStats(body.stats, localEnv);
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
                        attr.preFlow(newTree);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   773
                        /* 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
   774
                         * to determine if it can complete normally
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
                        flow.analyzeLambda(localEnv, newTree, make, true);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   777
                    } finally {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   778
                        log.popDiagnosticHandler(diagHandler);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   779
                    }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   780
                    return newTree.canCompleteNormally;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   781
                } finally {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   782
                    JCBlock body = (JCBlock)newTree.body;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   783
                    unenterScanner.scan(body.stats);
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   784
                    localEnv.info.scope.leave();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   785
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   786
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   787
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   788
            @Override
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   789
            public void visitNewClass(JCNewClass tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   790
                //do nothing
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   791
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   792
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   793
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   794
            public void visitApply(JCMethodInvocation tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   795
                //do nothing
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
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   798
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   799
            public void visitReference(JCMemberReference tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   800
                Check.CheckContext checkContext = resultInfo.checkContext;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   801
                Type pt = resultInfo.pt;
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   802
                if (!inferenceContext.inferencevars.contains(pt)) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   803
                    try {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   804
                        types.findDescriptorType(pt);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   805
                    } catch (Types.FunctionDescriptorLookupError ex) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   806
                        checkContext.report(null, ex.getDiagnostic());
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   807
                    }
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   808
                    Env<AttrContext> localEnv = env.dup(tree);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
   809
                    JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), localEnv,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
   810
                            attr.memberReferenceQualifierResult(tree));
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19914
diff changeset
   811
                    ListBuffer<Type> argtypes = new ListBuffer<>();
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   812
                    for (Type t : types.findDescriptorType(pt).getParameterTypes()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   813
                        argtypes.append(Type.noType);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   814
                    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   815
                    JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
   816
                    mref2.expr = exprTree;
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
   817
                    Symbol lookupSym =
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   818
                            rs.resolveMemberReference(localEnv, mref2, exprTree.type,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   819
                                    tree.name, argtypes.toList(), List.nil(), rs.arityMethodCheck,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   820
                                    inferenceContext, rs.structuralReferenceChooser).fst;
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
   821
                    switch (lookupSym.kind) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
   822
                        case WRONG_MTH:
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
   823
                        case WRONG_MTHS:
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   824
                            //note: as argtypes are erroneous types, type-errors must
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   825
                            //have been caused by arity mismatch
28458
f20c5dd05e34 8069164: Fix langtools make build so that diagnostic framework can be used
mcimadamore
parents: 28457
diff changeset
   826
                            checkContext.report(tree, diags.fragment(Fragments.IncompatibleArgTypesInMref));
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   827
                            break;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   828
                        case ABSENT_MTH:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   829
                        case STATICERR:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   830
                            //if no method found, or method found with wrong staticness, report better message
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   831
                            checkContext.report(tree, ((ResolveError)lookupSym).getDiagnostic(DiagnosticType.FRAGMENT,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   832
                                    tree, exprTree.type.tsym, exprTree.type, tree.name, argtypes.toList(), List.nil()));
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28275
diff changeset
   833
                            break;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   834
                    }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   835
                }
14057
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
        }
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   838
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   839
        /* 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
   840
         * 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
   841
         * 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
   842
         * 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
   843
         */
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   844
        class LambdaBodyStructChecker extends TreeScanner {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   845
            boolean isVoidCompatible = true;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   846
            boolean isPotentiallyValueCompatible = true;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   847
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   848
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   849
            public void visitClassDef(JCClassDecl tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   850
                // do nothing
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   851
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   852
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   853
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   854
            public void visitLambda(JCLambda tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   855
                // do nothing
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   856
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   857
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   858
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   859
            public void visitNewClass(JCNewClass tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   860
                // do nothing
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   861
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   862
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   863
            @Override
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   864
            public void visitReturn(JCReturn tree) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   865
                if (tree.expr != null) {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   866
                    isVoidCompatible = false;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   867
                } else {
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   868
                    isPotentiallyValueCompatible = false;
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   869
                }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   870
            }
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   871
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   872
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   873
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   874
    /** 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
   875
    final DeferredAttrContext emptyDeferredAttrContext;
14057
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
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   878
     * 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
   879
     * 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
   880
     * 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
   881
     * 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
   882
     */
29554
6d7957bd6866 8074100: Turn Type.Mapping into a true visitor
mcimadamore
parents: 29292
diff changeset
   883
    class DeferredTypeMap extends TypeMapping<Void> {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   884
        DeferredAttrContext deferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   885
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   886
        protected DeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   887
            this.deferredAttrContext = new DeferredAttrContext(mode, msym, phase,
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   888
                    infer.emptyContext, emptyDeferredAttrContext, types.noWarnings);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   889
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   890
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   891
        @Override
29554
6d7957bd6866 8074100: Turn Type.Mapping into a true visitor
mcimadamore
parents: 29292
diff changeset
   892
        public Type visitType(Type t, Void _unused) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14258
diff changeset
   893
            if (!t.hasTag(DEFERRED)) {
29554
6d7957bd6866 8074100: Turn Type.Mapping into a true visitor
mcimadamore
parents: 29292
diff changeset
   894
                return super.visitType(t, null);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   895
            } else {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   896
                DeferredType dt = (DeferredType)t;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   897
                return typeOf(dt);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   898
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   899
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   900
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   901
        protected Type typeOf(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   902
            switch (deferredAttrContext.mode) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   903
                case CHECK:
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   904
                    return dt.tree.type == null ? Type.noType : dt.tree.type;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   905
                case SPECULATIVE:
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   906
                    return dt.speculativeType(deferredAttrContext.msym, deferredAttrContext.phase);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   907
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   908
            Assert.error();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   909
            return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   910
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   911
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   912
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   913
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   914
     * Specialized recovery deferred mapping.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   915
     * 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
   916
     * (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
   917
     * 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
   918
     * (the latter step is useful in a recovery scenario).
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   919
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   920
    public class RecoveryDeferredTypeMap extends DeferredTypeMap {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   921
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   922
        public RecoveryDeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) {
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   923
            super(mode, msym, phase != null ? phase : MethodResolutionPhase.BOX);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   924
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   925
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   926
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   927
        protected Type typeOf(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   928
            Type owntype = super.typeOf(dt);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   929
            return owntype == Type.noType ?
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   930
                        recover(dt) : owntype;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   931
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   932
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   933
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   934
         * 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
   935
         * reduced to an ordinary type. Functional deferred types and conditionals
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   936
         * are mapped to themselves, in order to have a richer diagnostic
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   937
         * representation. Remaining deferred types are attributed using
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   938
         * a default expected type (j.l.Object).
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   939
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   940
        private Type recover(DeferredType dt) {
18902
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   941
            dt.check(attr.new RecoveryInfo(deferredAttrContext) {
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   942
                @Override
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   943
                protected Type check(DiagnosticPosition pos, Type found) {
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   944
                    return chk.checkNonVoid(pos, super.check(pos, found));
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   945
                }
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   946
            });
29554
6d7957bd6866 8074100: Turn Type.Mapping into a true visitor
mcimadamore
parents: 29292
diff changeset
   947
            return super.visit(dt);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   948
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   949
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   950
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   951
    /**
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   952
     * 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
   953
     * 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
   954
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   955
    abstract static class FilterScanner extends TreeScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   956
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   957
        final Filter<JCTree> treeFilter;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   958
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   959
        FilterScanner(final Set<JCTree.Tag> validTags) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   960
            this.treeFilter = new Filter<JCTree>() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   961
                public boolean accepts(JCTree t) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   962
                    return validTags.contains(t.getTag());
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   963
                }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   964
            };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   965
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   966
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   967
        @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   968
        public void scan(JCTree tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   969
            if (tree != null) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   970
                if (treeFilter.accepts(tree)) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   971
                    super.scan(tree);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   972
                } else {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   973
                    skip(tree);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   974
                }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   975
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   976
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   977
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   978
        /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   979
         * 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
   980
         */
24066
1dfb66929538 8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents: 22163
diff changeset
   981
        void skip(JCTree tree) {}
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   982
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   983
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   984
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   985
     * 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
   986
     * a given argument expression.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   987
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   988
    static class PolyScanner extends FilterScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   989
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   990
        PolyScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   991
            super(EnumSet.of(CONDEXPR, PARENS, LAMBDA, REFERENCE));
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   992
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   993
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   994
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   995
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   996
     * 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
   997
     * within a lambda expression body.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   998
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   999
    static class LambdaReturnScanner extends FilterScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1000
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1001
        LambdaReturnScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1002
            super(EnumSet.of(BLOCK, CASE, CATCH, DOLOOP, FOREACHLOOP,
25275
e5e9bf4b8c49 8042759: Lambda returning implicitly-typed lambdas considered pertinent to applicability
vromero
parents: 25007
diff changeset
  1003
                    FORLOOP, IF, RETURN, SYNCHRONIZED, SWITCH, TRY, WHILELOOP));
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1004
        }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1005
    }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1006
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1007
    /**
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1008
     * This visitor is used to check that structural expressions conform
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1009
     * 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
  1010
     * inferring types that make some of the nested expressions incompatible
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1011
     * with their corresponding instantiated target
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1012
     */
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1013
    class CheckStuckPolicy extends PolyScanner implements DeferredStuckPolicy, Infer.FreeTypeListener {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1014
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1015
        Type pt;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1016
        Infer.InferenceContext inferenceContext;
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
  1017
        Set<Type> stuckVars = new LinkedHashSet<>();
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21718
diff changeset
  1018
        Set<Type> depVars = new LinkedHashSet<>();
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1019
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1020
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1021
        public boolean isStuck() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1022
            return !stuckVars.isEmpty();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1023
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1024
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1025
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1026
        public Set<Type> stuckVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1027
            return stuckVars;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1028
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1029
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1030
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1031
        public Set<Type> depVars() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1032
            return depVars;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1033
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1034
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1035
        public CheckStuckPolicy(ResultInfo resultInfo, DeferredType dt) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1036
            this.pt = resultInfo.pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1037
            this.inferenceContext = resultInfo.checkContext.inferenceContext();
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1038
            scan(dt.tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1039
            if (!stuckVars.isEmpty()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1040
                resultInfo.checkContext.inferenceContext()
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1041
                        .addFreeTypeListener(List.from(stuckVars), this);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1042
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1043
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1044
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1045
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1046
        public void typesInferred(InferenceContext inferenceContext) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1047
            stuckVars.clear();
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1048
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1049
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1050
        @Override
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1051
        public void visitLambda(JCLambda tree) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1052
            if (inferenceContext.inferenceVars().contains(pt)) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1053
                stuckVars.add(pt);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1054
            }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
  1055
            if (!types.isFunctionalInterface(pt)) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1056
                return;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1057
            }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1058
            Type descType = types.findDescriptorType(pt);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1059
            List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes());
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
  1060
            if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT &&
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1061
                    freeArgVars.nonEmpty()) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1062
                stuckVars.addAll(freeArgVars);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1063
                depVars.addAll(inferenceContext.freeVarsIn(descType.getReturnType()));
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1064
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1065
            scanLambdaBody(tree, descType.getReturnType());
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1066
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1067
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1068
        @Override
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1069
        public void visitReference(JCMemberReference tree) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1070
            scan(tree.expr);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1071
            if (inferenceContext.inferenceVars().contains(pt)) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1072
                stuckVars.add(pt);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1073
                return;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1074
            }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
  1075
            if (!types.isFunctionalInterface(pt)) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1076
                return;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1077
            }
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
  1078
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1079
            Type descType = types.findDescriptorType(pt);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1080
            List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes());
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1081
            if (freeArgVars.nonEmpty() &&
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1082
                    tree.overloadKind == JCMemberReference.OverloadKind.OVERLOADED) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1083
                stuckVars.addAll(freeArgVars);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1084
                depVars.addAll(inferenceContext.freeVarsIn(descType.getReturnType()));
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
  1085
            }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1086
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1087
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1088
        void scanLambdaBody(JCLambda lambda, final Type pt) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1089
            if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1090
                Type prevPt = this.pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1091
                try {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1092
                    this.pt = pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1093
                    scan(lambda.body);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1094
                } finally {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1095
                    this.pt = prevPt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1096
                }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1097
            } else {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1098
                LambdaReturnScanner lambdaScanner = new LambdaReturnScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1099
                    @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1100
                    public void visitReturn(JCReturn tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1101
                        if (tree.expr != null) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1102
                            Type prevPt = CheckStuckPolicy.this.pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1103
                            try {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1104
                                CheckStuckPolicy.this.pt = pt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1105
                                CheckStuckPolicy.this.scan(tree.expr);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1106
                            } finally {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1107
                                CheckStuckPolicy.this.pt = prevPt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1108
                            }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1109
                        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1110
                    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1111
                };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
  1112
                lambdaScanner.scan(lambda.body);
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1113
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
  1114
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
  1115
    }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1116
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1117
    /**
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1118
     * This visitor is used to check that structural expressions conform
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1119
     * to their target - this step is required as inference could end up
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1120
     * inferring types that make some of the nested expressions incompatible
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1121
     * with their corresponding instantiated target
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1122
     */
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1123
    class OverloadStuckPolicy extends CheckStuckPolicy implements DeferredStuckPolicy {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1124
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1125
        boolean stuck;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1126
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1127
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1128
        public boolean isStuck() {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1129
            return super.isStuck() || stuck;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1130
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1131
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1132
        public OverloadStuckPolicy(ResultInfo resultInfo, DeferredType dt) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1133
            super(resultInfo, dt);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1134
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1135
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1136
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1137
        public void visitLambda(JCLambda tree) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1138
            super.visitLambda(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1139
            if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1140
                stuck = true;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1141
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1142
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1143
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1144
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1145
        public void visitReference(JCMemberReference tree) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1146
            super.visitReference(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1147
            if (tree.overloadKind == JCMemberReference.OverloadKind.OVERLOADED) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1148
                stuck = true;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1149
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1150
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1151
    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1152
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1153
    /**
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1154
     * Does the argument expression {@code expr} need speculative type-checking?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1155
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1156
    boolean isDeferred(Env<AttrContext> env, JCExpression expr) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1157
        DeferredChecker dc = new DeferredChecker(env);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1158
        dc.scan(expr);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1159
        return dc.result.isPoly();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1160
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1161
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1162
    /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1163
     * The kind of an argument expression. This is used by the analysis that
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1164
     * determines as to whether speculative attribution is necessary.
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1165
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1166
    enum ArgumentExpressionKind {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1167
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1168
        /** kind that denotes poly argument expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1169
        POLY,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1170
        /** kind that denotes a standalone expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1171
        NO_POLY,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1172
        /** kind that denotes a primitive/boxed standalone expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1173
        PRIMITIVE;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1174
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1175
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1176
         * Does this kind denote a poly argument expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1177
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1178
        public final boolean isPoly() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1179
            return this == POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1180
        }
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
         * Does this kind denote a primitive standalone expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1184
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1185
        public final boolean isPrimitive() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1186
            return this == PRIMITIVE;
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
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1190
         * Compute the kind of a standalone expression of a given type
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1191
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1192
        static ArgumentExpressionKind standaloneKind(Type type, Types types) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1193
            return types.unboxedTypeOrType(type).isPrimitive() ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1194
                    ArgumentExpressionKind.PRIMITIVE :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1195
                    ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1196
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1197
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1198
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1199
         * Compute the kind of a method argument expression given its symbol
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1200
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1201
        static ArgumentExpressionKind methodKind(Symbol sym, Types types) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1202
            Type restype = sym.type.getReturnType();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1203
            if (sym.type.hasTag(FORALL) &&
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1204
                    restype.containsAny(((ForAll)sym.type).tvars)) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1205
                return ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1206
            } else {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1207
                return ArgumentExpressionKind.standaloneKind(restype, types);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1208
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1209
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1210
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1211
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1212
    /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1213
     * Tree scanner used for checking as to whether an argument expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1214
     * requires speculative attribution
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1215
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1216
    final class DeferredChecker extends FilterScanner {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1217
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1218
        Env<AttrContext> env;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1219
        ArgumentExpressionKind result;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1220
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1221
        public DeferredChecker(Env<AttrContext> env) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1222
            super(deferredCheckerTags);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1223
            this.env = env;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1224
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1225
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1226
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1227
        public void visitLambda(JCLambda tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1228
            //a lambda is always a poly expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1229
            result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1230
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1231
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1232
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1233
        public void visitReference(JCMemberReference tree) {
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1234
            //perform arity-based check
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1235
            Env<AttrContext> localEnv = env.dup(tree);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
  1236
            JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), localEnv,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26531
diff changeset
  1237
                    attr.memberReferenceQualifierResult(tree));
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1238
            JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1239
            mref2.expr = exprTree;
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1240
            Symbol res =
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1241
                    rs.getMemberReference(tree, localEnv, mref2,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1242
                        exprTree.type, tree.name);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 20249
diff changeset
  1243
            tree.sym = res;
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1244
            if (res.kind.isResolutionTargetError() ||
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1245
                    res.type != null && res.type.hasTag(FORALL) ||
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1246
                    (res.flags() & Flags.VARARGS) != 0 ||
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1247
                    (TreeInfo.isStaticSelector(exprTree, tree.name.table.names) &&
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1248
                    exprTree.type.isRaw())) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1249
                tree.overloadKind = JCMemberReference.OverloadKind.OVERLOADED;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1250
            } else {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1251
                tree.overloadKind = JCMemberReference.OverloadKind.UNOVERLOADED;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 18912
diff changeset
  1252
            }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1253
            //a method reference is always a poly expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1254
            result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1255
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1256
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1257
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1258
        public void visitTypeCast(JCTypeCast tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1259
            //a cast is always a standalone expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1260
            result = ArgumentExpressionKind.NO_POLY;
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
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1264
        public void visitConditional(JCConditional tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1265
            scan(tree.truepart);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1266
            if (!result.isPrimitive()) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1267
                result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1268
                return;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1269
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1270
            scan(tree.falsepart);
27551
14a74a56c4a0 8064464: regression with type inference of conditional expression
mcimadamore
parents: 27224
diff changeset
  1271
            result = reduce(ArgumentExpressionKind.PRIMITIVE).isPrimitive() ?
14a74a56c4a0 8064464: regression with type inference of conditional expression
mcimadamore
parents: 27224
diff changeset
  1272
                    ArgumentExpressionKind.PRIMITIVE :
14a74a56c4a0 8064464: regression with type inference of conditional expression
mcimadamore
parents: 27224
diff changeset
  1273
                    ArgumentExpressionKind.POLY;
14a74a56c4a0 8064464: regression with type inference of conditional expression
mcimadamore
parents: 27224
diff changeset
  1274
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1275
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1276
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1277
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1278
        public void visitNewClass(JCNewClass tree) {
28142
32a6b1af81b1 8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents: 27551
diff changeset
  1279
            result = TreeInfo.isDiamond(tree) ?
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1280
                    ArgumentExpressionKind.POLY : ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1281
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1282
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1283
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1284
        public void visitApply(JCMethodInvocation tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1285
            Name name = TreeInfo.name(tree.meth);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1286
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1287
            //fast path
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1288
            if (tree.typeargs.nonEmpty() ||
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1289
                    name == name.table.names._this ||
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1290
                    name == name.table.names._super) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1291
                result = ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1292
                return;
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
            //slow path
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1296
            Symbol sym = quicklyResolveMethod(env, tree);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1297
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1298
            if (sym == null) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1299
                result = ArgumentExpressionKind.POLY;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1300
                return;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1301
            }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1302
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1303
            result = analyzeCandidateMethods(sym, ArgumentExpressionKind.PRIMITIVE,
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1304
                    argumentKindAnalyzer);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1305
        }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1306
        //where
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1307
            private boolean isSimpleReceiver(JCTree rec) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1308
                switch (rec.getTag()) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1309
                    case IDENT:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1310
                        return true;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1311
                    case SELECT:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1312
                        return isSimpleReceiver(((JCFieldAccess)rec).selected);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1313
                    case TYPEAPPLY:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1314
                    case TYPEARRAY:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1315
                        return true;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1316
                    case ANNOTATED_TYPE:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1317
                        return isSimpleReceiver(((JCAnnotatedType)rec).underlyingType);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1318
                    case APPLY:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1319
                        return true;
30728
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1320
                    case NEWCLASS:
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1321
                        JCNewClass nc = (JCNewClass) rec;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1322
                        return nc.encl == null && nc.def == null && !TreeInfo.isDiamond(nc);
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1323
                    default:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1324
                        return false;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1325
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1326
            }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1327
            private ArgumentExpressionKind reduce(ArgumentExpressionKind kind) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1328
                return argumentKindAnalyzer.reduce(result, kind);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1329
            }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1330
            MethodAnalyzer<ArgumentExpressionKind> argumentKindAnalyzer =
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1331
                    new MethodAnalyzer<ArgumentExpressionKind>() {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1332
                @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1333
                public ArgumentExpressionKind process(MethodSymbol ms) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1334
                    return ArgumentExpressionKind.methodKind(ms, types);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1335
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1336
                @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1337
                public ArgumentExpressionKind reduce(ArgumentExpressionKind kind1,
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1338
                                                     ArgumentExpressionKind kind2) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1339
                    switch (kind1) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1340
                        case PRIMITIVE: return kind2;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1341
                        case NO_POLY: return kind2.isPoly() ? kind2 : kind1;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1342
                        case POLY: return kind1;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1343
                        default:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1344
                            Assert.error();
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1345
                            return null;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1346
                    }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1347
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1348
                @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1349
                public boolean shouldStop(ArgumentExpressionKind result) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1350
                    return result.isPoly();
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1351
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1352
            };
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1353
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1354
        @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1355
        public void visitLiteral(JCLiteral tree) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1356
            Type litType = attr.litType(tree.typetag);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1357
            result = ArgumentExpressionKind.standaloneKind(litType, types);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1358
        }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1359
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1360
        @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1361
        void skip(JCTree tree) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1362
            result = ArgumentExpressionKind.NO_POLY;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1363
        }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1364
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1365
        private Symbol quicklyResolveMethod(Env<AttrContext> env, final JCMethodInvocation tree) {
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1366
            final JCExpression rec = tree.meth.hasTag(SELECT) ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1367
                    ((JCFieldAccess)tree.meth).selected :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1368
                    null;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1369
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1370
            if (rec != null && !isSimpleReceiver(rec)) {
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1371
                return null;
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1372
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1373
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1374
            Type site;
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1375
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1376
            if (rec != null) {
30728
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1377
                switch (rec.getTag()) {
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1378
                    case APPLY:
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1379
                        Symbol recSym = quicklyResolveMethod(env, (JCMethodInvocation) rec);
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1380
                        if (recSym == null)
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1381
                            return null;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1382
                        Symbol resolvedReturnType =
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1383
                                analyzeCandidateMethods(recSym, syms.errSymbol, returnSymbolAnalyzer);
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1384
                        if (resolvedReturnType == null)
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1385
                            return null;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1386
                        site = resolvedReturnType.type;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1387
                        break;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1388
                    case NEWCLASS:
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1389
                        JCNewClass nc = (JCNewClass) rec;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1390
                        site = attribSpeculative(nc.clazz, env, attr.unknownTypeExprInfo).type;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1391
                        break;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1392
                    default:
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1393
                        site = attribSpeculative(rec, env, attr.unknownTypeExprInfo).type;
f0c022c5290c 8079613: Deeply chained expressions + several overloads + unnecessary inference result in excessive compile times.
sadayapalam
parents: 29842
diff changeset
  1394
                        break;
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1395
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1396
            } else {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1397
                site = env.enclClass.sym.type;
18901
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
  1398
            }
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
  1399
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29051
diff changeset
  1400
            site = types.skipTypeVars(site, true);
26531
c32c9586ea94 8056984: Exception in compiler: java.lang.AssertionError: isSubClass T
jlahoda
parents: 26530
diff changeset
  1401
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
  1402
            List<Type> args = rs.dummyArgs(tree.args.length());
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1403
            Name name = TreeInfo.name(tree.meth);
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1404
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
  1405
            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
  1406
                @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1407
                Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1408
                    return rec == null ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1409
                        rs.findFun(env, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) :
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28891
diff changeset
  1410
                        rs.findMethod(env, site, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired());
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1411
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1412
                @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1413
                Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1414
                    return sym;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1415
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1416
            };
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1417
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1418
            return rs.lookupMethod(env, tree, site.tsym, rs.arityMethodCheck, lh);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1419
        }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1420
        //where:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1421
            MethodAnalyzer<Symbol> returnSymbolAnalyzer = new MethodAnalyzer<Symbol>() {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1422
                @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1423
                public Symbol process(MethodSymbol ms) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1424
                    ArgumentExpressionKind kind = ArgumentExpressionKind.methodKind(ms, types);
26530
b4d78593e4c9 8056014: Type inference may be skipped for a complex receiver generic method in a parameter position
jlahoda
parents: 26266
diff changeset
  1425
                    if (kind == ArgumentExpressionKind.POLY || ms.getReturnType().hasTag(TYPEVAR))
b4d78593e4c9 8056014: Type inference may be skipped for a complex receiver generic method in a parameter position
jlahoda
parents: 26266
diff changeset
  1426
                        return null;
b4d78593e4c9 8056014: Type inference may be skipped for a complex receiver generic method in a parameter position
jlahoda
parents: 26266
diff changeset
  1427
                    return ms.getReturnType().tsym;
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1428
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1429
                @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1430
                public Symbol reduce(Symbol s1, Symbol s2) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1431
                    return s1 == syms.errSymbol ? s2 : s1 == s2 ? s1 : null;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1432
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1433
                @Override
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1434
                public boolean shouldStop(Symbol result) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1435
                    return result == null;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1436
                }
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1437
            };
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1438
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1439
        /**
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1440
         * Process the result of Resolve.lookupMethod. If sym is a method symbol, the result of
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1441
         * MethodAnalyzer.process is returned. If sym is an ambiguous symbol, all the candidate
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1442
         * methods are inspected one by one, using MethodAnalyzer.process. The outcomes are
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1443
         * reduced using MethodAnalyzer.reduce (using defaultValue as the first value over which
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1444
         * the reduction runs). MethodAnalyzer.shouldStop can be used to stop the inspection early.
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1445
         */
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1446
        <E> E analyzeCandidateMethods(Symbol sym, E defaultValue, MethodAnalyzer<E> analyzer) {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1447
            switch (sym.kind) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
  1448
                case MTH:
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1449
                    return analyzer.process((MethodSymbol) sym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
  1450
                case AMBIGUOUS:
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1451
                    Resolve.AmbiguityError err = (Resolve.AmbiguityError)sym.baseSymbol();
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1452
                    E res = defaultValue;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1453
                    for (Symbol s : err.ambiguousSyms) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
  1454
                        if (s.kind == MTH) {
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1455
                            res = analyzer.reduce(res, analyzer.process((MethodSymbol) s));
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1456
                            if (analyzer.shouldStop(res))
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1457
                                return res;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1458
                        }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1459
                    }
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1460
                    return res;
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1461
                default:
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1462
                    return defaultValue;
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1463
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1464
        }
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1465
    }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1466
24649
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1467
    /** Analyzer for methods - used by analyzeCandidateMethods. */
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1468
    interface MethodAnalyzer<E> {
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1469
        E process(MethodSymbol ms);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1470
        E reduce(E e1, E e2);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1471
        boolean shouldStop(E result);
1760d92bc6d2 8031967: For some sources compiler compiles for ever
jlahoda
parents: 24396
diff changeset
  1472
    }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1473
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1474
    //where
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1475
    private EnumSet<JCTree.Tag> deferredCheckerTags =
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1476
            EnumSet.of(LAMBDA, REFERENCE, PARENS, TYPECAST,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1477
                    CONDEXPR, NEWCLASS, APPLY, LITERAL);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
  1478
}