langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
author mcimadamore
Wed, 17 Jul 2013 14:09:46 +0100
changeset 18910 c967bfda9283
parent 18902 972298345a83
child 18912 e25cd61d8e59
permissions -rw-r--r--
8016175: Add bottom-up type-checking support for unambiguous method references Summary: Type-checking of non-overloaded method references should be independent from target-type Reviewed-by: jjg, vromero
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
/*
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16566
diff changeset
     2
 * Copyright (c) 2012, 2013, 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
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    28
import com.sun.tools.javac.code.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    29
import com.sun.tools.javac.tree.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    30
import com.sun.tools.javac.util.*;
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16566
diff changeset
    31
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    32
import com.sun.tools.javac.code.Symbol.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    33
import com.sun.tools.javac.code.Type.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    34
import com.sun.tools.javac.comp.Attr.ResultInfo;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    35
import com.sun.tools.javac.comp.Infer.InferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    36
import com.sun.tools.javac.comp.Resolve.MethodResolutionPhase;
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
    37
import com.sun.tools.javac.comp.Resolve.ReferenceLookupHelper;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    38
import com.sun.tools.javac.tree.JCTree.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    39
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    40
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    41
import java.util.ArrayList;
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
    42
import java.util.EnumSet;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
    43
import java.util.LinkedHashSet;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    44
import java.util.Map;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    45
import java.util.Set;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    46
import java.util.WeakHashMap;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    47
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
    48
import static com.sun.tools.javac.code.TypeTag.*;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    49
import static com.sun.tools.javac.tree.JCTree.Tag.*;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    50
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    51
/**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    52
 * 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
    53
 * 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
    54
 * with a temporary 'deferred type' that is checked (possibly multiple times)
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    55
 * against an expected formal type.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    56
 *
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    57
 *  <p><b>This is NOT part of any supported API.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    58
 *  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
    59
 *  This code and its internal interfaces are subject to change or
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    60
 *  deletion without notice.</b>
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
public class DeferredAttr extends JCTree.Visitor {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    63
    protected static final Context.Key<DeferredAttr> deferredAttrKey =
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    64
        new Context.Key<DeferredAttr>();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    65
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    66
    final Attr attr;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    67
    final Check chk;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
    68
    final JCDiagnostic.Factory diags;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    69
    final Enter enter;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    70
    final Infer infer;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
    71
    final Resolve rs;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    72
    final Log log;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    73
    final Symtab syms;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    74
    final TreeMaker make;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    75
    final Types types;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    76
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    77
    public static DeferredAttr instance(Context context) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    78
        DeferredAttr instance = context.get(deferredAttrKey);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    79
        if (instance == null)
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    80
            instance = new DeferredAttr(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    81
        return instance;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    82
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    83
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    84
    protected DeferredAttr(Context context) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    85
        context.put(deferredAttrKey, this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    86
        attr = Attr.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    87
        chk = Check.instance(context);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
    88
        diags = JCDiagnostic.Factory.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    89
        enter = Enter.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    90
        infer = Infer.instance(context);
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
    91
        rs = Resolve.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    92
        log = Log.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    93
        syms = Symtab.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    94
        make = TreeMaker.instance(context);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
    95
        types = Types.instance(context);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
    96
        Names names = Names.instance(context);
18902
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
    97
        stuckTree = make.Ident(names.empty).setType(Type.stuckType);
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
    98
        emptyDeferredAttrContext =
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
    99
            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
   100
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   101
                void addDeferredAttrNode(DeferredType dt, ResultInfo ri, List<Type> stuckVars) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   102
                    Assert.error("Empty deferred context!");
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   103
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   104
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   105
                void complete() {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   106
                    Assert.error("Empty deferred context!");
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   107
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   108
            };
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   109
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   110
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   111
    /** shared tree for stuck expressions */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   112
    final JCTree stuckTree;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   113
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   114
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   115
     * 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
   116
     * 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
   117
     * discovered through type-checking the deferred type against a target-type.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   118
     * 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
   119
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   120
    public class DeferredType extends Type {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   121
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   122
        public JCExpression tree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   123
        Env<AttrContext> env;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   124
        AttrMode mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   125
        SpeculativeCache speculativeCache;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   126
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   127
        DeferredType(JCExpression tree, Env<AttrContext> env) {
18646
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   128
            super(null);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   129
            this.tree = tree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   130
            this.env = env.dup(tree, env.info.dup());
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   131
            this.speculativeCache = new SpeculativeCache();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   132
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   133
18646
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   134
        @Override
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   135
        public TypeTag getTag() {
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   136
            return DEFERRED;
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   137
        }
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18643
diff changeset
   138
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   139
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   140
         * 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
   141
         * that triggered speculative attribution on a given deferred type. Each entry
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   142
         * 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
   143
         * has been added.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   144
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   145
        class SpeculativeCache {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   146
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   147
            private Map<Symbol, List<Entry>> cache =
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   148
                    new WeakHashMap<Symbol, List<Entry>>();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   149
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   150
            class Entry {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   151
                JCTree speculativeTree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   152
                Resolve.MethodResolutionPhase phase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   153
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   154
                public Entry(JCTree speculativeTree, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   155
                    this.speculativeTree = speculativeTree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   156
                    this.phase = phase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   157
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   158
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   159
                boolean matches(Resolve.MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   160
                    return this.phase == phase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   161
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   162
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   163
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   164
            /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   165
             * Retrieve a speculative cache entry corresponding to given symbol
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   166
             * and resolution phase
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   167
             */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   168
            Entry get(Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   169
                List<Entry> entries = cache.get(msym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   170
                if (entries == null) return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   171
                for (Entry e : entries) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   172
                    if (e.matches(phase)) return e;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   173
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   174
                return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   175
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   176
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   177
            /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   178
             * Stores a speculative cache entry corresponding to given symbol
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   179
             * and resolution phase
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   180
             */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   181
            void put(Symbol msym, JCTree speculativeTree, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   182
                List<Entry> entries = cache.get(msym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   183
                if (entries == null) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   184
                    entries = List.nil();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   185
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   186
                cache.put(msym, entries.prepend(new Entry(speculativeTree, phase)));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   187
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   188
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   189
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   190
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   191
         * 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
   192
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   193
        Type speculativeType(Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   194
            SpeculativeCache.Entry e = speculativeCache.get(msym, phase);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   195
            return e != null ? e.speculativeTree.type : Type.noType;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   196
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   197
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   198
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   199
         * Check a deferred type against a potential target-type. Depending on
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   200
         * the current attribution mode, a normal vs. speculative attribution
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   201
         * 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
   202
         * speculative round for a given target method symbol; moreover, a normal
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   203
         * attribution round must follow one or more speculative rounds.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   204
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   205
        Type check(ResultInfo resultInfo) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   206
            return check(resultInfo, stuckVars(tree, env, resultInfo), basicCompleter);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   207
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   208
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   209
        Type check(ResultInfo resultInfo, List<Type> stuckVars, DeferredTypeCompleter deferredTypeCompleter) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   210
            DeferredAttrContext deferredAttrContext =
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   211
                    resultInfo.checkContext.deferredAttrContext();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   212
            Assert.check(deferredAttrContext != emptyDeferredAttrContext);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   213
            if (stuckVars.nonEmpty()) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   214
                deferredAttrContext.addDeferredAttrNode(this, resultInfo, stuckVars);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   215
                return Type.noType;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   216
            } else {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   217
                try {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   218
                    return deferredTypeCompleter.complete(this, resultInfo, deferredAttrContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   219
                } finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   220
                    mode = deferredAttrContext.mode;
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
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   226
    /**
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   227
     * 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
   228
     * a deferred type.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   229
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   230
    interface DeferredTypeCompleter {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   231
        /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   232
         * 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
   233
         * circumstances, type-checking could amount to full attribution
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   234
         * or partial structural check (aka potential applicability).
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   235
         */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   236
        Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   237
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   238
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   239
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   240
     * 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
   241
     * 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
   242
     * or speculative attribution.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   243
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   244
    DeferredTypeCompleter basicCompleter = new DeferredTypeCompleter() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   245
        public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   246
            switch (deferredAttrContext.mode) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   247
                case SPECULATIVE:
16566
604ce45d5f23 8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents: 16326
diff changeset
   248
                    //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
   249
                    //speculative rounds...
604ce45d5f23 8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents: 16326
diff changeset
   250
                    Assert.check(dt.mode == null || dt.mode == AttrMode.SPECULATIVE);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   251
                    JCTree speculativeTree = attribSpeculative(dt.tree, dt.env, resultInfo);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   252
                    dt.speculativeCache.put(deferredAttrContext.msym, speculativeTree, deferredAttrContext.phase);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   253
                    return speculativeTree.type;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   254
                case CHECK:
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   255
                    Assert.check(dt.mode != null);
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   256
                    return attr.attribTree(dt.tree, dt.env, resultInfo);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   257
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   258
            Assert.error();
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   259
            return null;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   260
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   261
    };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   262
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   263
    DeferredTypeCompleter dummyCompleter = new DeferredTypeCompleter() {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   264
        public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   265
            Assert.check(deferredAttrContext.mode == AttrMode.CHECK);
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   266
            return dt.tree.type = Type.noType;
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   267
        }
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   268
    };
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   269
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   270
    /**
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   271
     * 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
   272
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   273
    public enum AttrMode {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   274
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   275
         * A speculative type-checking round is used during overload resolution
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   276
         * mainly to generate constraints on inference variables. Side-effects
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   277
         * arising from type-checking the expression associated with the deferred
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   278
         * type are reversed after the speculative round finishes. This means the
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   279
         * expression tree will be left in a blank state.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   280
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   281
        SPECULATIVE,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   282
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   283
         * 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
   284
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   285
        CHECK;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   286
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   287
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   288
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   289
     * Routine that performs speculative type-checking; the input AST node is
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   290
     * 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
   291
     * restored after type-checking. All diagnostics (but critical ones) are
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   292
     * disabled during speculative type-checking.
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
    JCTree attribSpeculative(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) {
16309
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   295
        final JCTree newTree = new TreeCopier<Object>(make).copy(tree);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   296
        Env<AttrContext> speculativeEnv = env.dup(newTree, env.info.dup(env.info.scope.dupUnshared()));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   297
        speculativeEnv.info.scope.owner = env.info.scope.owner;
14538
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   298
        Log.DeferredDiagnosticHandler deferredDiagnosticHandler =
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   299
                new Log.DeferredDiagnosticHandler(log, new Filter<JCDiagnostic>() {
16309
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   300
            public boolean accepts(final JCDiagnostic d) {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   301
                class PosScanner extends TreeScanner {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   302
                    boolean found = false;
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   303
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   304
                    @Override
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   305
                    public void scan(JCTree tree) {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   306
                        if (tree != null &&
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   307
                                tree.pos() == d.getDiagnosticPosition()) {
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   308
                            found = true;
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   309
                        }
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   310
                        super.scan(tree);
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   311
                    }
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   312
                };
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   313
                PosScanner posScanner = new PosScanner();
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   314
                posScanner.scan(newTree);
db71f8ecc136 8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents: 16294
diff changeset
   315
                return posScanner.found;
14538
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   316
            }
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   317
        });
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   318
        try {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   319
            attr.attribTree(newTree, speculativeEnv, resultInfo);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   320
            unenterScanner.scan(newTree);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   321
            return newTree;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   322
        } finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   323
            unenterScanner.scan(newTree);
14538
384681be798f 8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents: 14359
diff changeset
   324
            log.popDiagnosticHandler(deferredDiagnosticHandler);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   325
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   326
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   327
    //where
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   328
        protected TreeScanner unenterScanner = new TreeScanner() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   329
            @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   330
            public void visitClassDef(JCClassDecl tree) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   331
                ClassSymbol csym = tree.sym;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   332
                //if something went wrong during method applicability check
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   333
                //it is possible that nested expressions inside argument expression
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   334
                //are left unchecked - in such cases there's nothing to clean up.
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   335
                if (csym == null) return;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   336
                enter.typeEnvs.remove(csym);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   337
                chk.compiled.remove(csym.flatname);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   338
                syms.classes.remove(csym.flatname);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   339
                super.visitClassDef(tree);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   340
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   341
        };
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   342
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   343
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   344
     * 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
   345
     * 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
   346
     * the symbol of the method being checked, the overload resolution phase,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   347
     * 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
   348
     * 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
   349
     * 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
   350
     * routine makes sure that all pending nodes are properly processed, by
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   351
     * progressively instantiating all inference variables on which one or more
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   352
     * deferred attribution node is stuck.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   353
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   354
    class DeferredAttrContext {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   355
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   356
        /** attribution mode */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   357
        final AttrMode mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   358
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   359
        /** symbol of the method being checked */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   360
        final Symbol msym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   361
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   362
        /** method resolution step */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   363
        final Resolve.MethodResolutionPhase phase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   364
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   365
        /** inference context */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   366
        final InferenceContext inferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   367
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   368
        /** parent deferred context */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   369
        final DeferredAttrContext parent;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   370
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   371
        /** Warner object to report warnings */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   372
        final Warner warn;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   373
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   374
        /** list of deferred attribution nodes to be processed */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   375
        ArrayList<DeferredAttrNode> deferredAttrNodes = new ArrayList<DeferredAttrNode>();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   376
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   377
        DeferredAttrContext(AttrMode mode, Symbol msym, MethodResolutionPhase phase,
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   378
                InferenceContext inferenceContext, DeferredAttrContext parent, Warner warn) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   379
            this.mode = mode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   380
            this.msym = msym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   381
            this.phase = phase;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   382
            this.parent = parent;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   383
            this.warn = warn;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   384
            this.inferenceContext = inferenceContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   385
        }
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
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   388
         * 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
   389
         * 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
   390
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   391
        void addDeferredAttrNode(final DeferredType dt, ResultInfo resultInfo, List<Type> stuckVars) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   392
            deferredAttrNodes.add(new DeferredAttrNode(dt, resultInfo, stuckVars));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   393
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   394
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   395
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   396
         * Incrementally process all nodes, by skipping 'stuck' nodes and attributing
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   397
         * '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
   398
         * some inference variable might get eagerly instantiated so that all nodes
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   399
         * can be type-checked.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   400
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   401
        void complete() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   402
            while (!deferredAttrNodes.isEmpty()) {
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   403
                Set<Type> stuckVars = new LinkedHashSet<Type>();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   404
                boolean progress = false;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   405
                //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
   406
                //attribution round can add new nodes to the list
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   407
                for (DeferredAttrNode deferredAttrNode : List.from(deferredAttrNodes)) {
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   408
                    if (!deferredAttrNode.process(this)) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   409
                        stuckVars.addAll(deferredAttrNode.stuckVars);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   410
                    } else {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   411
                        deferredAttrNodes.remove(deferredAttrNode);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   412
                        progress = true;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   413
                    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   414
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   415
                if (!progress) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   416
                    //remove all variables that have already been instantiated
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   417
                    //from the list of stuck variables
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   418
                    inferenceContext.solveAny(List.from(stuckVars), warn);
15705
c4124695db0c 8007463: Cleanup inference related classes
mcimadamore
parents: 15374
diff changeset
   419
                    inferenceContext.notifyChange();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   420
                }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   421
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   422
        }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   423
    }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   424
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   425
    /**
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   426
     * 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
   427
     * 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
   428
     */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   429
    class DeferredAttrNode implements Infer.FreeTypeListener {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   430
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   431
        /** underlying deferred type */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   432
        DeferredType dt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   433
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   434
        /** underlying target type information */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   435
        ResultInfo resultInfo;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   436
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   437
        /** list of uninferred inference variables causing this node to be stuck */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   438
        List<Type> stuckVars;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   439
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   440
        DeferredAttrNode(DeferredType dt, ResultInfo resultInfo, List<Type> stuckVars) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   441
            this.dt = dt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   442
            this.resultInfo = resultInfo;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   443
            this.stuckVars = stuckVars;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   444
            if (!stuckVars.isEmpty()) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   445
                resultInfo.checkContext.inferenceContext().addFreeTypeListener(stuckVars, this);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   446
            }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   447
        }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   448
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   449
        @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   450
        public void typesInferred(InferenceContext inferenceContext) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   451
            stuckVars = List.nil();
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   452
            resultInfo = resultInfo.dup(inferenceContext.asInstType(resultInfo.pt));
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   453
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   454
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   455
        /**
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   456
         * Process a deferred attribution node.
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   457
         * Invariant: a stuck node cannot be processed.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   458
         */
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   459
        @SuppressWarnings("fallthrough")
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   460
        boolean process(DeferredAttrContext deferredAttrContext) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   461
            switch (deferredAttrContext.mode) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   462
                case SPECULATIVE:
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   463
                    dt.check(resultInfo, List.<Type>nil(), new StructuralStuckChecker());
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   464
                    return true;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   465
                case CHECK:
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   466
                    if (stuckVars.nonEmpty()) {
15717
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   467
                        //stuck expression - see if we can propagate
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   468
                        if (deferredAttrContext.parent != emptyDeferredAttrContext &&
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   469
                                Type.containsAny(deferredAttrContext.parent.inferenceContext.inferencevars, List.from(stuckVars))) {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   470
                            deferredAttrContext.parent.deferredAttrNodes.add(this);
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   471
                            dt.check(resultInfo, List.<Type>nil(), dummyCompleter);
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   472
                            return true;
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   473
                        } else {
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   474
                            return false;
ab55670d2e62 8007464: Add graph inference support
mcimadamore
parents: 15706
diff changeset
   475
                        }
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   476
                    } else {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   477
                        dt.check(resultInfo, stuckVars, basicCompleter);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   478
                        return true;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   479
                    }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   480
                default:
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   481
                    throw new AssertionError("Bad mode");
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   482
            }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   483
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   484
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   485
        /**
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   486
         * Structural checker for stuck expressions
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   487
         */
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   488
        class StructuralStuckChecker extends TreeScanner implements DeferredTypeCompleter {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   489
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   490
            ResultInfo resultInfo;
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   491
            InferenceContext inferenceContext;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   492
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   493
            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
   494
                this.resultInfo = resultInfo;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   495
                this.inferenceContext = deferredAttrContext.inferenceContext;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   496
                dt.tree.accept(this);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   497
                dt.speculativeCache.put(deferredAttrContext.msym, stuckTree, deferredAttrContext.phase);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   498
                return Type.noType;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   499
            }
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
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   502
            public void visitLambda(JCLambda tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   503
                Check.CheckContext checkContext = resultInfo.checkContext;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   504
                Type pt = resultInfo.pt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   505
                if (inferenceContext.inferencevars.contains(pt)) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   506
                    //ok
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   507
                    return;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   508
                } else {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   509
                    //must be a functional descriptor
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   510
                    try {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   511
                        Type desc = types.findDescriptorType(pt);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   512
                        if (desc.getParameterTypes().length() != tree.params.length()) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   513
                            checkContext.report(tree, diags.fragment("incompatible.arg.types.in.lambda"));
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   514
                        }
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   515
                    } catch (Types.FunctionDescriptorLookupError ex) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   516
                        checkContext.report(null, ex.getDiagnostic());
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   517
                    }
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
            @Override
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   522
            public void visitNewClass(JCNewClass tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   523
                //do nothing
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   524
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   525
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   526
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   527
            public void visitApply(JCMethodInvocation tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   528
                //do nothing
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   529
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   530
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   531
            @Override
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   532
            public void visitReference(JCMemberReference tree) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   533
                Check.CheckContext checkContext = resultInfo.checkContext;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   534
                Type pt = resultInfo.pt;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   535
                if (inferenceContext.inferencevars.contains(pt)) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   536
                    //ok
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   537
                    return;
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   538
                } else {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   539
                    try {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   540
                        types.findDescriptorType(pt);
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   541
                    } catch (Types.FunctionDescriptorLookupError ex) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   542
                        checkContext.report(null, ex.getDiagnostic());
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   543
                    }
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   544
                    switch (tree.sym.kind) {
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   545
                        //note: as argtypes are erroneous types, type-errors must
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   546
                        //have been caused by arity mismatch
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   547
                        case Kinds.ABSENT_MTH:
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   548
                        case Kinds.WRONG_MTH:
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   549
                        case Kinds.WRONG_MTHS:
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   550
                        case Kinds.STATICERR:
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   551
                        case Kinds.MISSING_ENCL:
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   552
                           checkContext.report(null, diags.fragment("incompatible.arg.types.in.mref"));
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15717
diff changeset
   553
                    }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   554
                }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   555
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   556
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   557
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   558
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   559
    /** 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
   560
    final DeferredAttrContext emptyDeferredAttrContext;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   561
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   562
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   563
     * 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
   564
     * 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
   565
     * 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
   566
     * 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
   567
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   568
    class DeferredTypeMap extends Type.Mapping {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   569
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   570
        DeferredAttrContext deferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   571
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   572
        protected DeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   573
            super(String.format("deferredTypeMap[%s]", mode));
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   574
            this.deferredAttrContext = new DeferredAttrContext(mode, msym, phase,
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
   575
                    infer.emptyContext, emptyDeferredAttrContext, types.noWarnings);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   576
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   577
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   578
        protected boolean validState(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   579
            return dt.mode != null &&
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   580
                    deferredAttrContext.mode.ordinal() <= dt.mode.ordinal();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   581
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   582
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   583
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   584
        public Type apply(Type t) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14258
diff changeset
   585
            if (!t.hasTag(DEFERRED)) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   586
                return t.map(this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   587
            } else {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   588
                DeferredType dt = (DeferredType)t;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   589
                Assert.check(validState(dt));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   590
                return typeOf(dt);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   591
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   592
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   593
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   594
        protected Type typeOf(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   595
            switch (deferredAttrContext.mode) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   596
                case CHECK:
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   597
                    return dt.tree.type == null ? Type.noType : dt.tree.type;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   598
                case SPECULATIVE:
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   599
                    return dt.speculativeType(deferredAttrContext.msym, deferredAttrContext.phase);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   600
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   601
            Assert.error();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   602
            return null;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   603
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   604
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   605
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   606
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   607
     * Specialized recovery deferred mapping.
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   608
     * 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
   609
     * (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
   610
     * 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
   611
     * (the latter step is useful in a recovery scenario).
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   612
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   613
    public class RecoveryDeferredTypeMap extends DeferredTypeMap {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   614
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   615
        public RecoveryDeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) {
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   616
            super(mode, msym, phase != null ? phase : MethodResolutionPhase.BOX);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   617
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   618
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   619
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   620
        protected Type typeOf(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   621
            Type owntype = super.typeOf(dt);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   622
            return owntype == Type.noType ?
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   623
                        recover(dt) : owntype;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   624
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   625
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   626
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   627
        protected boolean validState(DeferredType dt) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   628
            return true;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   629
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   630
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   631
        /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   632
         * 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
   633
         * reduced to an ordinary type. Functional deferred types and conditionals
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   634
         * are mapped to themselves, in order to have a richer diagnostic
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   635
         * representation. Remaining deferred types are attributed using
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   636
         * a default expected type (j.l.Object).
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   637
         */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   638
        private Type recover(DeferredType dt) {
18902
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   639
            dt.check(attr.new RecoveryInfo(deferredAttrContext) {
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   640
                @Override
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   641
                protected Type check(DiagnosticPosition pos, Type found) {
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   642
                    return chk.checkNonVoid(pos, super.check(pos, found));
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   643
                }
972298345a83 8016059: Cannot compile following lambda
mcimadamore
parents: 18901
diff changeset
   644
            });
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   645
            return super.apply(dt);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   646
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   647
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   648
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   649
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   650
     * Retrieves the list of inference variables that need to be inferred before
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   651
     * an AST node can be type-checked
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   652
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   653
    @SuppressWarnings("fallthrough")
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   654
    List<Type> stuckVars(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   655
                if (resultInfo.pt.hasTag(NONE) || resultInfo.pt.isErroneous()) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   656
            return List.nil();
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   657
        } else {
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   658
            return stuckVarsInternal(tree, resultInfo.pt, env, resultInfo.checkContext.inferenceContext());
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   659
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   660
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   661
    //where
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   662
        private List<Type> stuckVarsInternal(JCTree tree, Type pt, Env<AttrContext> env, Infer.InferenceContext inferenceContext) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   663
            StuckChecker sc = new StuckChecker(pt, env, inferenceContext);
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   664
            sc.scan(tree);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   665
            return List.from(sc.stuckVars);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   666
        }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   667
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   668
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   669
     * 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
   670
     * 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
   671
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   672
    abstract static class FilterScanner extends TreeScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   673
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   674
        final Filter<JCTree> treeFilter;
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   675
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   676
        FilterScanner(final Set<JCTree.Tag> validTags) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   677
            this.treeFilter = new Filter<JCTree>() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   678
                public boolean accepts(JCTree t) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   679
                    return validTags.contains(t.getTag());
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   680
                }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   681
            };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   682
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   683
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   684
        @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   685
        public void scan(JCTree tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   686
            if (tree != null) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   687
                if (treeFilter.accepts(tree)) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   688
                    super.scan(tree);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   689
                } else {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   690
                    skip(tree);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   691
                }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   692
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   693
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   694
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   695
        /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   696
         * 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
   697
         */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   698
        abstract void skip(JCTree tree);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   699
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   700
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   701
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   702
     * 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
   703
     * a given argument expression.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   704
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   705
    static class PolyScanner extends FilterScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   706
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   707
        PolyScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   708
            super(EnumSet.of(CONDEXPR, PARENS, LAMBDA, REFERENCE));
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   709
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   710
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   711
        @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   712
        void skip(JCTree tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   713
            //do nothing
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   714
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   715
    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   716
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   717
    /**
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   718
     * 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
   719
     * within a lambda expression body.
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   720
     */
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   721
    static class LambdaReturnScanner extends FilterScanner {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   722
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   723
        LambdaReturnScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   724
            super(EnumSet.of(BLOCK, CASE, CATCH, DOLOOP, FOREACHLOOP,
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   725
                    FORLOOP, RETURN, SYNCHRONIZED, SWITCH, TRY, WHILELOOP));
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   726
        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   727
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   728
        @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   729
        void skip(JCTree tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   730
            //do nothing
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   731
        }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   732
    }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   733
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   734
    /**
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   735
     * This visitor is used to check that structural expressions conform
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   736
     * 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
   737
     * inferring types that make some of the nested expressions incompatible
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   738
     * with their corresponding instantiated target
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   739
     */
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   740
    class StuckChecker extends PolyScanner {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   741
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   742
        Type pt;
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   743
        Env<AttrContext> env;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   744
        Infer.InferenceContext inferenceContext;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   745
        Set<Type> stuckVars = new LinkedHashSet<Type>();
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   746
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   747
        StuckChecker(Type pt, Env<AttrContext> env, Infer.InferenceContext inferenceContext) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   748
            this.pt = pt;
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   749
            this.env = env;
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   750
            this.inferenceContext = inferenceContext;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   751
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   752
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   753
        @Override
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   754
        public void visitLambda(JCLambda tree) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   755
            if (inferenceContext.inferenceVars().contains(pt)) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   756
                stuckVars.add(pt);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   757
            }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   758
            if (!types.isFunctionalInterface(pt)) {
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   759
                return;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   760
            }
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   761
            Type descType = types.findDescriptorType(pt);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   762
            List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes());
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   763
            if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT &&
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   764
                    freeArgVars.nonEmpty()) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   765
                stuckVars.addAll(freeArgVars);
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   766
            }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   767
            scanLambdaBody(tree, descType.getReturnType());
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   768
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   769
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   770
        @Override
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   771
        public void visitReference(JCMemberReference tree) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   772
            scan(tree.expr);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   773
            if (inferenceContext.inferenceVars().contains(pt)) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   774
                stuckVars.add(pt);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   775
                return;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   776
            }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15039
diff changeset
   777
            if (!types.isFunctionalInterface(pt)) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   778
                return;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   779
            }
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14538
diff changeset
   780
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   781
            Type descType = types.findDescriptorType(pt);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   782
            List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes());
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   783
            Env<AttrContext> localEnv = env.dup(tree, env.info.dup());
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   784
            if (freeArgVars.nonEmpty()) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   785
                //perform arity-based check
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   786
                JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), localEnv,
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   787
                        attr.memberReferenceQualifierResult(tree));
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   788
                ListBuffer<Type> argtypes = ListBuffer.lb();
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   789
                for (Type t : descType.getParameterTypes()) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   790
                    argtypes.append(Type.noType);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   791
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   792
                JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   793
                mref2.expr = exprTree;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   794
                Pair<Symbol, ReferenceLookupHelper> lookupRes =
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   795
                        rs.resolveMemberReference(tree, localEnv, mref2, exprTree.type,
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   796
                            tree.name, argtypes.toList(), null, true, rs.arityMethodCheck,
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   797
                            inferenceContext);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   798
                Symbol res = tree.sym = lookupRes.fst;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   799
                if (res.kind >= Kinds.ERRONEOUS ||
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   800
                        res.type.hasTag(FORALL) ||
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   801
                        (res.flags() & Flags.VARARGS) != 0 ||
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   802
                        (TreeInfo.isStaticSelector(exprTree, tree.name.table.names) &&
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   803
                        exprTree.type.isRaw())) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   804
                    stuckVars.addAll(freeArgVars);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   805
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   806
            }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   807
        }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   808
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   809
        void scanLambdaBody(JCLambda lambda, final Type pt) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   810
            if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) {
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   811
                stuckVars.addAll(stuckVarsInternal(lambda.body, pt, env, inferenceContext));
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   812
            } else {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   813
                LambdaReturnScanner lambdaScanner = new LambdaReturnScanner() {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   814
                    @Override
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   815
                    public void visitReturn(JCReturn tree) {
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   816
                        if (tree.expr != null) {
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   817
                            stuckVars.addAll(stuckVarsInternal(tree.expr, pt, env, inferenceContext));
15039
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   818
                        }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   819
                    }
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   820
                };
80190ab051c0 8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents: 14547
diff changeset
   821
                lambdaScanner.scan(lambda.body);
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
   822
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   823
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
   824
    }
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   825
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   826
    /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   827
     * Does the argument expression {@code expr} need speculative type-checking?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   828
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   829
    boolean isDeferred(Env<AttrContext> env, JCExpression expr) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   830
        DeferredChecker dc = new DeferredChecker(env);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   831
        dc.scan(expr);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   832
        return dc.result.isPoly();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   833
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   834
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   835
    /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   836
     * The kind of an argument expression. This is used by the analysis that
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   837
     * determines as to whether speculative attribution is necessary.
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   838
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   839
    enum ArgumentExpressionKind {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   840
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   841
        /** kind that denotes poly argument expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   842
        POLY,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   843
        /** kind that denotes a standalone expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   844
        NO_POLY,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   845
        /** kind that denotes a primitive/boxed standalone expression */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   846
        PRIMITIVE;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   847
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   848
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   849
         * Does this kind denote a poly argument expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   850
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   851
        public final boolean isPoly() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   852
            return this == POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   853
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   854
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   855
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   856
         * Does this kind denote a primitive standalone expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   857
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   858
        public final boolean isPrimitive() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   859
            return this == PRIMITIVE;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   860
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   861
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   862
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   863
         * Compute the kind of a standalone expression of a given type
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   864
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   865
        static ArgumentExpressionKind standaloneKind(Type type, Types types) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   866
            return types.unboxedTypeOrType(type).isPrimitive() ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   867
                    ArgumentExpressionKind.PRIMITIVE :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   868
                    ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   869
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   870
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   871
        /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   872
         * Compute the kind of a method argument expression given its symbol
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   873
         */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   874
        static ArgumentExpressionKind methodKind(Symbol sym, Types types) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   875
            Type restype = sym.type.getReturnType();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   876
            if (sym.type.hasTag(FORALL) &&
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   877
                    restype.containsAny(((ForAll)sym.type).tvars)) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   878
                return ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   879
            } else {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   880
                return ArgumentExpressionKind.standaloneKind(restype, types);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   881
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   882
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   883
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   884
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   885
    /**
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   886
     * Tree scanner used for checking as to whether an argument expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   887
     * requires speculative attribution
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   888
     */
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   889
    final class DeferredChecker extends FilterScanner {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   890
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   891
        Env<AttrContext> env;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   892
        ArgumentExpressionKind result;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   893
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   894
        public DeferredChecker(Env<AttrContext> env) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   895
            super(deferredCheckerTags);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   896
            this.env = env;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   897
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   898
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   899
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   900
        public void visitLambda(JCLambda tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   901
            //a lambda is always a poly expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   902
            result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   903
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   904
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   905
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   906
        public void visitReference(JCMemberReference tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   907
            //a method reference is always a poly expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   908
            result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   909
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   910
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   911
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   912
        public void visitTypeCast(JCTypeCast tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   913
            //a cast is always a standalone expression
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   914
            result = ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   915
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   916
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   917
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   918
        public void visitConditional(JCConditional tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   919
            scan(tree.truepart);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   920
            if (!result.isPrimitive()) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   921
                result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   922
                return;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   923
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   924
            scan(tree.falsepart);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   925
            result = reduce(ArgumentExpressionKind.PRIMITIVE);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   926
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   927
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   928
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   929
        public void visitNewClass(JCNewClass tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   930
            result = (TreeInfo.isDiamond(tree) || attr.findDiamonds) ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   931
                    ArgumentExpressionKind.POLY : ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   932
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   933
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   934
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   935
        public void visitApply(JCMethodInvocation tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   936
            Name name = TreeInfo.name(tree.meth);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   937
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   938
            //fast path
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   939
            if (tree.typeargs.nonEmpty() ||
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   940
                    name == name.table.names._this ||
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   941
                    name == name.table.names._super) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   942
                result = ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   943
                return;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   944
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   945
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   946
            //slow path
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   947
            final JCExpression rec = tree.meth.hasTag(SELECT) ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   948
                    ((JCFieldAccess)tree.meth).selected :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   949
                    null;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   950
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   951
            if (rec != null && !isSimpleReceiver(rec)) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   952
                //give up if receiver is too complex (to cut down analysis time)
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   953
                result = ArgumentExpressionKind.POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   954
                return;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   955
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   956
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   957
            Type site = rec != null ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   958
                    attribSpeculative(rec, env, attr.unknownTypeExprInfo).type :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   959
                    env.enclClass.sym.type;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   960
18901
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
   961
            while (site.hasTag(TYPEVAR)) {
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
   962
                site = site.getUpperBound();
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
   963
            }
8309dd8e14d9 8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents: 18646
diff changeset
   964
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   965
            List<Type> args = rs.dummyArgs(tree.args.length());
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   966
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18902
diff changeset
   967
            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
   968
                @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   969
                Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   970
                    return rec == null ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   971
                        rs.findFun(env, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   972
                        rs.findMethod(env, site, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired(), false);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   973
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   974
                @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   975
                Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   976
                    return sym;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   977
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   978
            };
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   979
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   980
            Symbol sym = rs.lookupMethod(env, tree, site.tsym, rs.arityMethodCheck, lh);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   981
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   982
            if (sym.kind == Kinds.AMBIGUOUS) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   983
                Resolve.AmbiguityError err = (Resolve.AmbiguityError)sym.baseSymbol();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   984
                result = ArgumentExpressionKind.PRIMITIVE;
18643
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 16975
diff changeset
   985
                for (Symbol s : err.ambiguousSyms) {
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 16975
diff changeset
   986
                    if (result.isPoly()) break;
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   987
                    if (s.kind == Kinds.MTH) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   988
                        result = reduce(ArgumentExpressionKind.methodKind(s, types));
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   989
                    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   990
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   991
            } else {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   992
                result = (sym.kind == Kinds.MTH) ?
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   993
                    ArgumentExpressionKind.methodKind(sym, types) :
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   994
                    ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   995
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   996
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   997
        //where
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   998
            private boolean isSimpleReceiver(JCTree rec) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
   999
                switch (rec.getTag()) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1000
                    case IDENT:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1001
                        return true;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1002
                    case SELECT:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1003
                        return isSimpleReceiver(((JCFieldAccess)rec).selected);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1004
                    case TYPEAPPLY:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1005
                    case TYPEARRAY:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1006
                        return true;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1007
                    case ANNOTATED_TYPE:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1008
                        return isSimpleReceiver(((JCAnnotatedType)rec).underlyingType);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1009
                    default:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1010
                        return false;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1011
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1012
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1013
            private ArgumentExpressionKind reduce(ArgumentExpressionKind kind) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1014
                switch (result) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1015
                    case PRIMITIVE: return kind;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1016
                    case NO_POLY: return kind.isPoly() ? kind : result;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1017
                    case POLY: return result;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1018
                    default:
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1019
                        Assert.error();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1020
                        return null;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1021
                }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1022
            }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1023
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1024
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1025
        public void visitLiteral(JCLiteral tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1026
            Type litType = attr.litType(tree.typetag);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1027
            result = ArgumentExpressionKind.standaloneKind(litType, types);
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1028
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1029
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1030
        @Override
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1031
        void skip(JCTree tree) {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1032
            result = ArgumentExpressionKind.NO_POLY;
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1033
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1034
    }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1035
    //where
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1036
    private EnumSet<JCTree.Tag> deferredCheckerTags =
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1037
            EnumSet.of(LAMBDA, REFERENCE, PARENS, TYPECAST,
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  1038
                    CONDEXPR, NEWCLASS, APPLY, LITERAL);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents:
diff changeset
  1039
}