langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
author mcimadamore
Wed, 17 Jul 2013 14:09:46 +0100
changeset 18910 c967bfda9283
parent 18668 1f99c1b43ab2
child 18911 dcc1e26a8c9c
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:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15374
diff changeset
     2
 * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5489
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5489
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5489
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5489
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5489
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
06bc494ca11e Initial load
duke
parents:
diff changeset
    26
package com.sun.tools.javac.comp;
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    28
import com.sun.tools.javac.api.Formattable.LocalizedString;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    29
import com.sun.tools.javac.code.*;
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
    30
import com.sun.tools.javac.code.Symbol.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    31
import com.sun.tools.javac.code.Type.*;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    32
import com.sun.tools.javac.comp.Attr.ResultInfo;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    33
import com.sun.tools.javac.comp.Check.CheckContext;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    34
import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    35
import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    36
import com.sun.tools.javac.comp.DeferredAttr.DeferredType;
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
    37
import com.sun.tools.javac.comp.Infer.InferenceContext;
15705
c4124695db0c 8007463: Cleanup inference related classes
mcimadamore
parents: 15385
diff changeset
    38
import com.sun.tools.javac.comp.Infer.FreeTypeListener;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
    39
import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
    40
import com.sun.tools.javac.comp.Resolve.MethodResolutionDiagHelper.DiagnosticRewriter;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
    41
import com.sun.tools.javac.comp.Resolve.MethodResolutionDiagHelper.Template;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
import com.sun.tools.javac.jvm.*;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
    43
import com.sun.tools.javac.main.Option;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    44
import com.sun.tools.javac.tree.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    45
import com.sun.tools.javac.tree.JCTree.*;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
    46
import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
    47
import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    48
import com.sun.tools.javac.util.*;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    49
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    50
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    51
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    52
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    53
import java.util.Arrays;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    54
import java.util.Collection;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
    55
import java.util.EnumMap;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    56
import java.util.EnumSet;
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
    57
import java.util.Iterator;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
    58
import java.util.LinkedHashMap;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
    59
import java.util.LinkedHashSet;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    60
import java.util.Map;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    61
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    62
import javax.lang.model.element.ElementVisitor;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    63
06bc494ca11e Initial load
duke
parents:
diff changeset
    64
import static com.sun.tools.javac.code.Flags.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
    65
import static com.sun.tools.javac.code.Flags.BLOCK;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    66
import static com.sun.tools.javac.code.Kinds.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
    67
import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
    68
import static com.sun.tools.javac.code.TypeTag.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    69
import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
    70
import static com.sun.tools.javac.tree.JCTree.Tag.*;
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
    71
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
/** Helper class for name resolution, used mostly by the attribution phase.
06bc494ca11e Initial load
duke
parents:
diff changeset
    73
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5846
diff changeset
    74
 *  <p><b>This is NOT part of any supported API.
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5846
diff changeset
    75
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    78
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
public class Resolve {
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
    protected static final Context.Key<Resolve> resolveKey =
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
        new Context.Key<Resolve>();
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1257
diff changeset
    83
    Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
    Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
    85
    Symtab syms;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    86
    Attr attr;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    87
    DeferredAttr deferredAttr;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    88
    Check chk;
06bc494ca11e Initial load
duke
parents:
diff changeset
    89
    Infer infer;
06bc494ca11e Initial load
duke
parents:
diff changeset
    90
    ClassReader reader;
06bc494ca11e Initial load
duke
parents:
diff changeset
    91
    TreeInfo treeinfo;
06bc494ca11e Initial load
duke
parents:
diff changeset
    92
    Types types;
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
    93
    JCDiagnostic.Factory diags;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    94
    public final boolean boxingEnabled; // = source.allowBoxing();
06bc494ca11e Initial load
duke
parents:
diff changeset
    95
    public final boolean varargsEnabled; // = source.allowVarargs();
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
    96
    public final boolean allowMethodHandles;
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
    97
    public final boolean allowDefaultMethods;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
    98
    public final boolean allowStructuralMostSpecific;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
    private final boolean debugResolve;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   100
    private final boolean compactMethodDiags;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   101
    final EnumSet<VerboseResolutionMode> verboseResolutionMode;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
   103
    Scope polymorphicSignatureScope;
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
   104
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   105
    protected Resolve(Context context) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   106
        context.put(resolveKey, this);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   107
        syms = Symtab.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   108
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   109
        varNotFound = new
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   110
            SymbolNotFoundError(ABSENT_VAR);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   111
        methodNotFound = new
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   112
            SymbolNotFoundError(ABSENT_MTH);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   113
        typeNotFound = new
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   114
            SymbolNotFoundError(ABSENT_TYP);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   115
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   116
        names = Names.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   117
        log = Log.instance(context);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   118
        attr = Attr.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   119
        deferredAttr = DeferredAttr.instance(context);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   120
        chk = Check.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   121
        infer = Infer.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   122
        reader = ClassReader.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   123
        treeinfo = TreeInfo.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   124
        types = Types.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   125
        diags = JCDiagnostic.Factory.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   126
        Source source = Source.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   127
        boxingEnabled = source.allowBoxing();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   128
        varargsEnabled = source.allowVarargs();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   129
        Options options = Options.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   130
        debugResolve = options.isSet("debugresolve");
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   131
        compactMethodDiags = options.isSet(Option.XDIAGS, "compact") ||
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   132
                options.isUnset(Option.XDIAGS) && options.isUnset("rawDiagnostics");
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   133
        verboseResolutionMode = VerboseResolutionMode.getVerboseResolutionMode(options);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   134
        Target target = Target.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   135
        allowMethodHandles = target.hasMethodHandles();
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
   136
        allowDefaultMethods = source.allowDefaultMethods();
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   137
        allowStructuralMostSpecific = source.allowStructuralMostSpecific();
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   138
        polymorphicSignatureScope = new Scope(syms.noSymbol);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   139
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   140
        inapplicableMethodException = new InapplicableMethodException(diags);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   141
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   142
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   143
    /** error symbols, which are returned when resolution fails
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   144
     */
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   145
    private final SymbolNotFoundError varNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   146
    private final SymbolNotFoundError methodNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   147
    private final SymbolNotFoundError typeNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   148
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   149
    public static Resolve instance(Context context) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   150
        Resolve instance = context.get(resolveKey);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   151
        if (instance == null)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   152
            instance = new Resolve(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   153
        return instance;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   154
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   155
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   156
    // <editor-fold defaultstate="collapsed" desc="Verbose resolution diagnostics support">
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   157
    enum VerboseResolutionMode {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   158
        SUCCESS("success"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   159
        FAILURE("failure"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   160
        APPLICABLE("applicable"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   161
        INAPPLICABLE("inapplicable"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   162
        DEFERRED_INST("deferred-inference"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   163
        PREDEF("predef"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   164
        OBJECT_INIT("object-init"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   165
        INTERNAL("internal");
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   166
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
   167
        final String opt;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   168
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   169
        private VerboseResolutionMode(String opt) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   170
            this.opt = opt;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   171
        }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   172
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   173
        static EnumSet<VerboseResolutionMode> getVerboseResolutionMode(Options opts) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   174
            String s = opts.get("verboseResolution");
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   175
            EnumSet<VerboseResolutionMode> res = EnumSet.noneOf(VerboseResolutionMode.class);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   176
            if (s == null) return res;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   177
            if (s.contains("all")) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   178
                res = EnumSet.allOf(VerboseResolutionMode.class);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   179
            }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   180
            Collection<String> args = Arrays.asList(s.split(","));
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   181
            for (VerboseResolutionMode mode : values()) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   182
                if (args.contains(mode.opt)) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   183
                    res.add(mode);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   184
                } else if (args.contains("-" + mode.opt)) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   185
                    res.remove(mode);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   186
                }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   187
            }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   188
            return res;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   189
        }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   190
    }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   191
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   192
    void reportVerboseResolutionDiagnostic(DiagnosticPosition dpos, Name name, Type site,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   193
            List<Type> argtypes, List<Type> typeargtypes, Symbol bestSoFar) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   194
        boolean success = bestSoFar.kind < ERRONEOUS;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   195
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   196
        if (success && !verboseResolutionMode.contains(VerboseResolutionMode.SUCCESS)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   197
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   198
        } else if (!success && !verboseResolutionMode.contains(VerboseResolutionMode.FAILURE)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   199
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   200
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   201
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   202
        if (bestSoFar.name == names.init &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   203
                bestSoFar.owner == syms.objectType.tsym &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   204
                !verboseResolutionMode.contains(VerboseResolutionMode.OBJECT_INIT)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   205
            return; //skip diags for Object constructor resolution
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   206
        } else if (site == syms.predefClass.type &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   207
                !verboseResolutionMode.contains(VerboseResolutionMode.PREDEF)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   208
            return; //skip spurious diags for predef symbols (i.e. operators)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   209
        } else if (currentResolutionContext.internalResolution &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   210
                !verboseResolutionMode.contains(VerboseResolutionMode.INTERNAL)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   211
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   212
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   213
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   214
        int pos = 0;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   215
        int mostSpecificPos = -1;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   216
        ListBuffer<JCDiagnostic> subDiags = ListBuffer.lb();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   217
        for (Candidate c : currentResolutionContext.candidates) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   218
            if (currentResolutionContext.step != c.step ||
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   219
                    (c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.APPLICABLE)) ||
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   220
                    (!c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.INAPPLICABLE))) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   221
                continue;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   222
            } else {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   223
                subDiags.append(c.isApplicable() ?
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   224
                        getVerboseApplicableCandidateDiag(pos, c.sym, c.mtype) :
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   225
                        getVerboseInapplicableCandidateDiag(pos, c.sym, c.details));
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   226
                if (c.sym == bestSoFar)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   227
                    mostSpecificPos = pos;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   228
                pos++;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   229
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   230
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   231
        String key = success ? "verbose.resolve.multi" : "verbose.resolve.multi.1";
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   232
        List<Type> argtypes2 = Type.map(argtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   233
                    deferredAttr.new RecoveryDeferredTypeMap(AttrMode.SPECULATIVE, bestSoFar, currentResolutionContext.step));
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   234
        JCDiagnostic main = diags.note(log.currentSource(), dpos, key, name,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   235
                site.tsym, mostSpecificPos, currentResolutionContext.step,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   236
                methodArguments(argtypes2),
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   237
                methodArguments(typeargtypes));
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   238
        JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, subDiags.toList());
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   239
        log.report(d);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   240
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   241
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   242
    JCDiagnostic getVerboseApplicableCandidateDiag(int pos, Symbol sym, Type inst) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   243
        JCDiagnostic subDiag = null;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   244
        if (sym.type.hasTag(FORALL)) {
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   245
            subDiag = diags.fragment("partial.inst.sig", inst);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   246
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   247
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   248
        String key = subDiag == null ?
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   249
                "applicable.method.found" :
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   250
                "applicable.method.found.1";
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   251
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   252
        return diags.fragment(key, pos, sym, subDiag);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   253
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   254
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   255
    JCDiagnostic getVerboseInapplicableCandidateDiag(int pos, Symbol sym, JCDiagnostic subDiag) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   256
        return diags.fragment("not.applicable.method.found", pos, sym, subDiag);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   257
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   258
    // </editor-fold>
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   259
06bc494ca11e Initial load
duke
parents:
diff changeset
   260
/* ************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
 * Identifier resolution
06bc494ca11e Initial load
duke
parents:
diff changeset
   262
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
06bc494ca11e Initial load
duke
parents:
diff changeset
   264
    /** An environment is "static" if its static level is greater than
06bc494ca11e Initial load
duke
parents:
diff changeset
   265
     *  the one of its outer environment
06bc494ca11e Initial load
duke
parents:
diff changeset
   266
     */
14056
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 14052
diff changeset
   267
    protected static boolean isStatic(Env<AttrContext> env) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
        return env.info.staticLevel > env.outer.info.staticLevel;
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   270
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
    /** An environment is an "initializer" if it is a constructor or
06bc494ca11e Initial load
duke
parents:
diff changeset
   272
     *  an instance initializer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   273
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   274
    static boolean isInitializer(Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   275
        Symbol owner = env.info.scope.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   276
        return owner.isConstructor() ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   277
            owner.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   278
            (owner.kind == VAR ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   279
             owner.kind == MTH && (owner.flags() & BLOCK) != 0) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   280
            (owner.flags() & STATIC) == 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
06bc494ca11e Initial load
duke
parents:
diff changeset
   283
    /** Is class accessible in given evironment?
06bc494ca11e Initial load
duke
parents:
diff changeset
   284
     *  @param env    The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   285
     *  @param c      The class whose accessibility is checked.
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
    public boolean isAccessible(Env<AttrContext> env, TypeSymbol c) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   288
        return isAccessible(env, c, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   289
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   290
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   291
    public boolean isAccessible(Env<AttrContext> env, TypeSymbol c, boolean checkInner) {
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   292
        boolean isAccessible = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   293
        switch ((short)(c.flags() & AccessFlags)) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   294
            case PRIVATE:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   295
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   296
                    env.enclClass.sym.outermostClass() ==
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   297
                    c.owner.outermostClass();
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   298
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   299
            case 0:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   300
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   301
                    env.toplevel.packge == c.owner // fast special case
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   302
                    ||
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   303
                    env.toplevel.packge == c.packge()
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   304
                    ||
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   305
                    // Hack: this case is added since synthesized default constructors
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   306
                    // of anonymous classes should be allowed to access
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   307
                    // classes which would be inaccessible otherwise.
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   308
                    env.enclMethod != null &&
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   309
                    (env.enclMethod.mods.flags & ANONCONSTR) != 0;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   310
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   311
            default: // error recovery
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   312
            case PUBLIC:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   313
                isAccessible = true;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   314
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   315
            case PROTECTED:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   316
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   317
                    env.toplevel.packge == c.owner // fast special case
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   318
                    ||
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   319
                    env.toplevel.packge == c.packge()
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   320
                    ||
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   321
                    isInnerSubClass(env.enclClass.sym, c.owner);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   322
                break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   323
        }
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   324
        return (checkInner == false || c.type.getEnclosingType() == Type.noType) ?
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   325
            isAccessible :
7637
467bc8fc514e 6990134: minor (but red) findbugs warnings
jjg
parents: 7635
diff changeset
   326
            isAccessible && isAccessible(env, c.type.getEnclosingType(), checkInner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   327
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   328
    //where
06bc494ca11e Initial load
duke
parents:
diff changeset
   329
        /** Is given class a subclass of given base class, or an inner class
06bc494ca11e Initial load
duke
parents:
diff changeset
   330
         *  of a subclass?
06bc494ca11e Initial load
duke
parents:
diff changeset
   331
         *  Return null if no such class exists.
06bc494ca11e Initial load
duke
parents:
diff changeset
   332
         *  @param c     The class which is the subclass or is contained in it.
06bc494ca11e Initial load
duke
parents:
diff changeset
   333
         *  @param base  The base class
06bc494ca11e Initial load
duke
parents:
diff changeset
   334
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
        private boolean isInnerSubClass(ClassSymbol c, Symbol base) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
            while (c != null && !c.isSubClass(base, types)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
                c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   338
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   339
            return c != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   340
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   341
06bc494ca11e Initial load
duke
parents:
diff changeset
   342
    boolean isAccessible(Env<AttrContext> env, Type t) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   343
        return isAccessible(env, t, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   344
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   345
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   346
    boolean isAccessible(Env<AttrContext> env, Type t, boolean checkInner) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   347
        return (t.hasTag(ARRAY))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   348
            ? isAccessible(env, types.elemtype(t))
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   349
            : isAccessible(env, t.tsym, checkInner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   350
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   351
17998
02a5abb2ae2f 7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents: 17804
diff changeset
   352
    /** Is symbol accessible as a member of given type in given environment?
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   353
     *  @param env    The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   354
     *  @param site   The type of which the tested symbol is regarded
06bc494ca11e Initial load
duke
parents:
diff changeset
   355
     *                as a member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
     *  @param sym    The symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   358
    public boolean isAccessible(Env<AttrContext> env, Type site, Symbol sym) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   359
        return isAccessible(env, site, sym, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   360
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   361
    public boolean isAccessible(Env<AttrContext> env, Type site, Symbol sym, boolean checkInner) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   362
        if (sym.name == names.init && sym.owner != site.tsym) return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   363
        switch ((short)(sym.flags() & AccessFlags)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   364
        case PRIVATE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
                (env.enclClass.sym == sym.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   367
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   368
                 env.enclClass.sym.outermostClass() ==
06bc494ca11e Initial load
duke
parents:
diff changeset
   369
                 sym.owner.outermostClass())
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
                &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   371
                sym.isInheritedIn(site.tsym, types);
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
        case 0:
06bc494ca11e Initial load
duke
parents:
diff changeset
   373
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
                (env.toplevel.packge == sym.owner.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   376
                 env.toplevel.packge == sym.packge())
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
                &&
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   378
                isAccessible(env, site, checkInner)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   379
                &&
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   380
                sym.isInheritedIn(site.tsym, types)
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   381
                &&
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   382
                notOverriddenIn(site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   383
        case PROTECTED:
06bc494ca11e Initial load
duke
parents:
diff changeset
   384
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
                (env.toplevel.packge == sym.owner.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
                 env.toplevel.packge == sym.packge()
06bc494ca11e Initial load
duke
parents:
diff changeset
   388
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   389
                 isProtectedAccessible(sym, env.enclClass.sym, site)
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   391
                 // OK to select instance method or field from 'super' or type name
06bc494ca11e Initial load
duke
parents:
diff changeset
   392
                 // (but type names should be disallowed elsewhere!)
06bc494ca11e Initial load
duke
parents:
diff changeset
   393
                 env.info.selectSuper && (sym.flags() & STATIC) == 0 && sym.kind != TYP)
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
                &&
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   395
                isAccessible(env, site, checkInner)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
                &&
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   397
                notOverriddenIn(site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   398
        default: // this case includes erroneous combinations as well
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   399
            return isAccessible(env, site, checkInner) && notOverriddenIn(site, sym);
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   400
        }
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   401
    }
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   402
    //where
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   403
    /* `sym' is accessible only if not overridden by
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   404
     * another symbol which is a member of `site'
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   405
     * (because, if it is overridden, `sym' is not strictly
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
   406
     * speaking a member of `site'). A polymorphic signature method
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
   407
     * cannot be overridden (e.g. MH.invokeExact(Object[])).
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   408
     */
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   409
    private boolean notOverriddenIn(Type site, Symbol sym) {
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   410
        if (sym.kind != MTH || sym.isConstructor() || sym.isStatic())
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   411
            return true;
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   412
        else {
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   413
            Symbol s2 = ((MethodSymbol)sym).implementation(site.tsym, types, true);
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
   414
            return (s2 == null || s2 == sym || sym.owner == s2.owner ||
3372
544ec1ab333c 6846972: cannot access member of raw type when erasure change overriding into overloading
mcimadamore
parents: 3143
diff changeset
   415
                    !types.isSubSignature(types.memberType(site, s2), types.memberType(site, sym)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   416
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   417
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   418
    //where
06bc494ca11e Initial load
duke
parents:
diff changeset
   419
        /** Is given protected symbol accessible if it is selected from given site
06bc494ca11e Initial load
duke
parents:
diff changeset
   420
         *  and the selection takes place in given class?
06bc494ca11e Initial load
duke
parents:
diff changeset
   421
         *  @param sym     The symbol with protected access
06bc494ca11e Initial load
duke
parents:
diff changeset
   422
         *  @param c       The class where the access takes place
06bc494ca11e Initial load
duke
parents:
diff changeset
   423
         *  @site          The type of the qualifier
06bc494ca11e Initial load
duke
parents:
diff changeset
   424
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   425
        private
06bc494ca11e Initial load
duke
parents:
diff changeset
   426
        boolean isProtectedAccessible(Symbol sym, ClassSymbol c, Type site) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   427
            while (c != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   428
                   !(c.isSubClass(sym.owner, types) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   429
                     (c.flags() & INTERFACE) == 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   430
                     // In JLS 2e 6.6.2.1, the subclass restriction applies
06bc494ca11e Initial load
duke
parents:
diff changeset
   431
                     // only to instance fields and methods -- types are excluded
06bc494ca11e Initial load
duke
parents:
diff changeset
   432
                     // regardless of whether they are declared 'static' or not.
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
                     ((sym.flags() & STATIC) != 0 || sym.kind == TYP || site.tsym.isSubClass(c, types))))
06bc494ca11e Initial load
duke
parents:
diff changeset
   434
                c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   435
            return c != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   436
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   437
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   438
    /**
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   439
     * Performs a recursive scan of a type looking for accessibility problems
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   440
     * from current attribution environment
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   441
     */
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   442
    void checkAccessibleType(Env<AttrContext> env, Type t) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   443
        accessibilityChecker.visit(t, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   444
    }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   445
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   446
    /**
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   447
     * Accessibility type-visitor
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   448
     */
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   449
    Types.SimpleVisitor<Void, Env<AttrContext>> accessibilityChecker =
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   450
            new Types.SimpleVisitor<Void, Env<AttrContext>>() {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   451
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   452
        void visit(List<Type> ts, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   453
            for (Type t : ts) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   454
                visit(t, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   455
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   456
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   457
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   458
        public Void visitType(Type t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   459
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   460
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   461
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   462
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   463
        public Void visitArrayType(ArrayType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   464
            visit(t.elemtype, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   465
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   466
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   467
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   468
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   469
        public Void visitClassType(ClassType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   470
            visit(t.getTypeArguments(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   471
            if (!isAccessible(env, t, true)) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   472
                accessBase(new AccessError(t.tsym), env.tree.pos(), env.enclClass.sym, t, t.tsym.name, true);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   473
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   474
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   475
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   476
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   477
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   478
        public Void visitWildcardType(WildcardType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   479
            visit(t.type, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   480
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   481
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   482
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   483
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   484
        public Void visitMethodType(MethodType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   485
            visit(t.getParameterTypes(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   486
            visit(t.getReturnType(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   487
            visit(t.getThrownTypes(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   488
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   489
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   490
    };
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   491
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   492
    /** Try to instantiate the type of a method so that it fits
17998
02a5abb2ae2f 7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents: 17804
diff changeset
   493
     *  given type arguments and argument types. If successful, return
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   494
     *  the method's instantiated type, else return null.
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
     *  The instantiation will take into account an additional leading
06bc494ca11e Initial load
duke
parents:
diff changeset
   496
     *  formal parameter if the method is an instance method seen as a member
17998
02a5abb2ae2f 7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents: 17804
diff changeset
   497
     *  of an under determined site. In this case, we treat site as an additional
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   498
     *  parameter and the parameters of the class containing the method as
06bc494ca11e Initial load
duke
parents:
diff changeset
   499
     *  additional type variables that get instantiated.
06bc494ca11e Initial load
duke
parents:
diff changeset
   500
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   501
     *  @param env         The current environment
06bc494ca11e Initial load
duke
parents:
diff changeset
   502
     *  @param site        The type of which the method is a member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   503
     *  @param m           The method symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   504
     *  @param argtypes    The invocation's given value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   505
     *  @param typeargtypes    The invocation's given type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   506
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   507
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
   508
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   509
    Type rawInstantiate(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
   510
                        Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
   511
                        Symbol m,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   512
                        ResultInfo resultInfo,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   513
                        List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   514
                        List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   515
                        boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   516
                        boolean useVarargs,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
   517
                        Warner warn) throws Infer.InferenceException {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
   518
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   519
        Type mt = types.memberType(site, m);
06bc494ca11e Initial load
duke
parents:
diff changeset
   520
        // tvars is the list of formal type variables for which type arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
        // need to inferred.
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   522
        List<Type> tvars = List.nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
        if (typeargtypes == null) typeargtypes = List.nil();
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   524
        if (!mt.hasTag(FORALL) && typeargtypes.nonEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   525
            // This is not a polymorphic method, but typeargs are supplied
9303
eae35c201e19 7032975: API files in javax.annotation.processing need to be updated for references to JLS
jjh
parents: 9302
diff changeset
   526
            // which is fine, see JLS 15.12.2.1
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   527
        } else if (mt.hasTag(FORALL) && typeargtypes.nonEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   528
            ForAll pmt = (ForAll) mt;
06bc494ca11e Initial load
duke
parents:
diff changeset
   529
            if (typeargtypes.length() != pmt.tvars.length())
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   530
                throw inapplicableMethodException.setMessage("arg.length.mismatch"); // not enough args
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   531
            // Check type arguments are within bounds
06bc494ca11e Initial load
duke
parents:
diff changeset
   532
            List<Type> formals = pmt.tvars;
06bc494ca11e Initial load
duke
parents:
diff changeset
   533
            List<Type> actuals = typeargtypes;
06bc494ca11e Initial load
duke
parents:
diff changeset
   534
            while (formals.nonEmpty() && actuals.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   535
                List<Type> bounds = types.subst(types.getBounds((TypeVar)formals.head),
06bc494ca11e Initial load
duke
parents:
diff changeset
   536
                                                pmt.tvars, typeargtypes);
06bc494ca11e Initial load
duke
parents:
diff changeset
   537
                for (; bounds.nonEmpty(); bounds = bounds.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
   538
                    if (!types.isSubtypeUnchecked(actuals.head, bounds.head, warn))
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   539
                        throw inapplicableMethodException.setMessage("explicit.param.do.not.conform.to.bounds",actuals.head, bounds);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   540
                formals = formals.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   541
                actuals = actuals.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   542
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   543
            mt = types.subst(pmt.qtype, pmt.tvars, typeargtypes);
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   544
        } else if (mt.hasTag(FORALL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   545
            ForAll pmt = (ForAll) mt;
06bc494ca11e Initial load
duke
parents:
diff changeset
   546
            List<Type> tvars1 = types.newInstances(pmt.tvars);
06bc494ca11e Initial load
duke
parents:
diff changeset
   547
            tvars = tvars.appendList(tvars1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
            mt = types.subst(pmt.qtype, pmt.tvars, tvars1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
06bc494ca11e Initial load
duke
parents:
diff changeset
   551
        // find out whether we need to go the slow route via infer
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
   552
        boolean instNeeded = tvars.tail != null; /*inlined: tvars.nonEmpty()*/
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   553
        for (List<Type> l = argtypes;
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
             l.tail != null/*inlined: l.nonEmpty()*/ && !instNeeded;
06bc494ca11e Initial load
duke
parents:
diff changeset
   555
             l = l.tail) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   556
            if (l.head.hasTag(FORALL)) instNeeded = true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   558
06bc494ca11e Initial load
duke
parents:
diff changeset
   559
        if (instNeeded)
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
   560
            return infer.instantiateMethod(env,
5489
e7af65bf7577 6730476: invalid "unchecked generic array" warning
mcimadamore
parents: 5321
diff changeset
   561
                                    tvars,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   562
                                    (MethodType)mt,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   563
                                    resultInfo,
5846
6df0e6bcb388 6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents: 5520
diff changeset
   564
                                    m,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   565
                                    argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   566
                                    allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   567
                                    useVarargs,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   568
                                    currentResolutionContext,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   569
                                    warn);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   570
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   571
        currentResolutionContext.methodCheck.argumentsAcceptable(env, currentResolutionContext.deferredAttrContext(m, infer.emptyContext, resultInfo, warn),
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   572
                                argtypes, mt.getParameterTypes(), warn);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   573
        return mt;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   574
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   575
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   576
    Type checkMethod(Env<AttrContext> env,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   577
                     Type site,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   578
                     Symbol m,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   579
                     ResultInfo resultInfo,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   580
                     List<Type> argtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   581
                     List<Type> typeargtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   582
                     Warner warn) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   583
        MethodResolutionContext prevContext = currentResolutionContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   584
        try {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   585
            currentResolutionContext = new MethodResolutionContext();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   586
            currentResolutionContext.attrMode = DeferredAttr.AttrMode.CHECK;
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   587
            if (env.tree.hasTag(JCTree.Tag.REFERENCE)) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   588
                //method/constructor references need special check class
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   589
                //to handle inference variables in 'argtypes' (might happen
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   590
                //during an unsticking round)
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   591
                currentResolutionContext.methodCheck =
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   592
                        new MethodReferenceCheck(resultInfo.checkContext.inferenceContext());
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   593
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   594
            MethodResolutionPhase step = currentResolutionContext.step = env.info.pendingResolutionPhase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   595
            return rawInstantiate(env, site, m, resultInfo, argtypes, typeargtypes,
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   596
                    step.isBoxingRequired(), step.isVarargsRequired(), warn);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   597
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   598
        finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   599
            currentResolutionContext = prevContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   600
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   601
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   602
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   603
    /** Same but returns null instead throwing a NoInstanceException
06bc494ca11e Initial load
duke
parents:
diff changeset
   604
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   605
    Type instantiate(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
   606
                     Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
   607
                     Symbol m,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   608
                     ResultInfo resultInfo,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   609
                     List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   610
                     List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   611
                     boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   612
                     boolean useVarargs,
06bc494ca11e Initial load
duke
parents:
diff changeset
   613
                     Warner warn) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   614
        try {
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   615
            return rawInstantiate(env, site, m, resultInfo, argtypes, typeargtypes,
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   616
                                  allowBoxing, useVarargs, warn);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   617
        } catch (InapplicableMethodException ex) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   618
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   619
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   620
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   621
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   622
    /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   623
     * This interface defines an entry point that should be used to perform a
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   624
     * method check. A method check usually consist in determining as to whether
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   625
     * a set of types (actuals) is compatible with another set of types (formals).
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   626
     * Since the notion of compatibility can vary depending on the circumstances,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   627
     * this interfaces allows to easily add new pluggable method check routines.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   628
     */
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   629
    interface MethodCheck {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   630
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   631
         * Main method check routine. A method check usually consist in determining
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   632
         * as to whether a set of types (actuals) is compatible with another set of
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   633
         * types (formals). If an incompatibility is found, an unchecked exception
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   634
         * is assumed to be thrown.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   635
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   636
        void argumentsAcceptable(Env<AttrContext> env,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   637
                                DeferredAttrContext deferredAttrContext,
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
   638
                                List<Type> argtypes,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   639
                                List<Type> formals,
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   640
                                Warner warn);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   641
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   642
        /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   643
         * Retrieve the method check object that will be used during a
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   644
         * most specific check.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   645
         */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   646
        MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict);
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   647
    }
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   648
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   649
    /**
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   650
     * Helper enum defining all method check diagnostics (used by resolveMethodCheck).
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   651
     */
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   652
    enum MethodCheckDiag {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   653
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   654
         * Actuals and formals differs in length.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   655
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   656
        ARITY_MISMATCH("arg.length.mismatch", "infer.arg.length.mismatch"),
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   657
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   658
         * An actual is incompatible with a formal.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   659
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   660
        ARG_MISMATCH("no.conforming.assignment.exists", "infer.no.conforming.assignment.exists"),
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   661
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   662
         * An actual is incompatible with the varargs element type.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   663
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   664
        VARARG_MISMATCH("varargs.argument.mismatch", "infer.varargs.argument.mismatch"),
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   665
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   666
         * The varargs element type is inaccessible.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   667
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   668
        INACCESSIBLE_VARARGS("inaccessible.varargs.type", "inaccessible.varargs.type");
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   669
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   670
        final String basicKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   671
        final String inferKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   672
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   673
        MethodCheckDiag(String basicKey, String inferKey) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   674
            this.basicKey = basicKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   675
            this.inferKey = inferKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   676
        }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   677
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   678
        String regex() {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   679
            return String.format("([a-z]*\\.)*(%s|%s)", basicKey, inferKey);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   680
        }
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   681
    }
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   682
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   683
    /**
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   684
     * Dummy method check object. All methods are deemed applicable, regardless
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   685
     * of their formal parameter types.
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   686
     */
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   687
    MethodCheck nilMethodCheck = new MethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   688
        public void argumentsAcceptable(Env<AttrContext> env, DeferredAttrContext deferredAttrContext, List<Type> argtypes, List<Type> formals, Warner warn) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   689
            //do nothing - method always applicable regardless of actuals
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   690
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   691
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   692
        public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   693
            return this;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   694
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   695
    };
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   696
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   697
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   698
     * Base class for 'real' method checks. The class defines the logic for
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   699
     * iterating through formals and actuals and provides and entry point
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   700
     * that can be used by subclasses in order to define the actual check logic.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   701
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   702
    abstract class AbstractMethodCheck implements MethodCheck {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   703
        @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   704
        public void argumentsAcceptable(final Env<AttrContext> env,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   705
                                    DeferredAttrContext deferredAttrContext,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   706
                                    List<Type> argtypes,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   707
                                    List<Type> formals,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   708
                                    Warner warn) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   709
            //should we expand formals?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   710
            boolean useVarargs = deferredAttrContext.phase.isVarargsRequired();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   711
            List<JCExpression> trees = TreeInfo.args(env.tree);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   712
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   713
            //inference context used during this method check
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   714
            InferenceContext inferenceContext = deferredAttrContext.inferenceContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   715
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   716
            Type varargsFormal = useVarargs ? formals.last() : null;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   717
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   718
            if (varargsFormal == null &&
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   719
                    argtypes.size() != formals.size()) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   720
                reportMC(env.tree, MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   721
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   722
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   723
            while (argtypes.nonEmpty() && formals.head != varargsFormal) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   724
                DiagnosticPosition pos = trees != null ? trees.head : null;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   725
                checkArg(pos, false, argtypes.head, formals.head, deferredAttrContext, warn);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   726
                argtypes = argtypes.tail;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   727
                formals = formals.tail;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   728
                trees = trees != null ? trees.tail : trees;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   729
            }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   730
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   731
            if (formals.head != varargsFormal) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   732
                reportMC(env.tree, MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   733
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   734
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   735
            if (useVarargs) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   736
                //note: if applicability check is triggered by most specific test,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   737
                //the last argument of a varargs is _not_ an array type (see JLS 15.12.2.5)
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   738
                final Type elt = types.elemtype(varargsFormal);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   739
                while (argtypes.nonEmpty()) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   740
                    DiagnosticPosition pos = trees != null ? trees.head : null;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   741
                    checkArg(pos, true, argtypes.head, elt, deferredAttrContext, warn);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   742
                    argtypes = argtypes.tail;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   743
                    trees = trees != null ? trees.tail : trees;
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   744
                }
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
   745
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   746
        }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   747
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   748
        /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   749
         * Does the actual argument conforms to the corresponding formal?
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   750
         */
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   751
        abstract void checkArg(DiagnosticPosition pos, boolean varargs, Type actual, Type formal, DeferredAttrContext deferredAttrContext, Warner warn);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   752
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   753
        protected void reportMC(DiagnosticPosition pos, MethodCheckDiag diag, InferenceContext inferenceContext, Object... args) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   754
            boolean inferDiag = inferenceContext != infer.emptyContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   755
            InapplicableMethodException ex = inferDiag ?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   756
                    infer.inferenceException : inapplicableMethodException;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   757
            if (inferDiag && (!diag.inferKey.equals(diag.basicKey))) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   758
                Object[] args2 = new Object[args.length + 1];
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   759
                System.arraycopy(args, 0, args2, 1, args.length);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   760
                args2[0] = inferenceContext.inferenceVars();
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   761
                args = args2;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   762
            }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   763
            String key = inferDiag ? diag.inferKey : diag.basicKey;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   764
            throw ex.setMessage(diags.create(DiagnosticType.FRAGMENT, log.currentSource(), pos, key, args));
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   765
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   766
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   767
        public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   768
            return nilMethodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   769
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   770
    }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   771
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   772
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   773
     * Arity-based method check. A method is applicable if the number of actuals
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   774
     * supplied conforms to the method signature.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   775
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   776
    MethodCheck arityMethodCheck = new AbstractMethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   777
        @Override
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   778
        void checkArg(DiagnosticPosition pos, boolean varargs, Type actual, Type formal, DeferredAttrContext deferredAttrContext, Warner warn) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   779
            //do nothing - actual always compatible to formals
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   780
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   781
    };
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   782
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   783
    List<Type> dummyArgs(int length) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   784
        ListBuffer<Type> buf = ListBuffer.lb();
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   785
        for (int i = 0 ; i < length ; i++) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   786
            buf.append(Type.noType);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   787
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   788
        return buf.toList();
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   789
    }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   790
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   791
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   792
     * Main method applicability routine. Given a list of actual types A,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   793
     * a list of formal types F, determines whether the types in A are
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   794
     * compatible (by method invocation conversion) with the types in F.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   795
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   796
     * Since this routine is shared between overload resolution and method
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   797
     * type-inference, a (possibly empty) inference context is used to convert
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   798
     * formal types to the corresponding 'undet' form ahead of a compatibility
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   799
     * check so that constraints can be propagated and collected.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   800
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   801
     * Moreover, if one or more types in A is a deferred type, this routine uses
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   802
     * DeferredAttr in order to perform deferred attribution. If one or more actual
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   803
     * deferred types are stuck, they are placed in a queue and revisited later
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   804
     * after the remainder of the arguments have been seen. If this is not sufficient
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   805
     * to 'unstuck' the argument, a cyclic inference error is called out.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   806
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   807
     * A method check handler (see above) is used in order to report errors.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   808
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   809
    MethodCheck resolveMethodCheck = new AbstractMethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   810
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   811
        @Override
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   812
        void checkArg(DiagnosticPosition pos, boolean varargs, Type actual, Type formal, DeferredAttrContext deferredAttrContext, Warner warn) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   813
            ResultInfo mresult = methodCheckResult(varargs, formal, deferredAttrContext, warn);
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   814
            mresult.check(pos, actual);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   815
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   816
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   817
        @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   818
        public void argumentsAcceptable(final Env<AttrContext> env,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   819
                                    DeferredAttrContext deferredAttrContext,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   820
                                    List<Type> argtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   821
                                    List<Type> formals,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   822
                                    Warner warn) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   823
            super.argumentsAcceptable(env, deferredAttrContext, argtypes, formals, warn);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   824
            //should we expand formals?
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   825
            if (deferredAttrContext.phase.isVarargsRequired()) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   826
                //check varargs element type accessibility
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   827
                varargsAccessible(env, types.elemtype(formals.last()),
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   828
                        deferredAttrContext.inferenceContext);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   829
            }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   830
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   831
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   832
        private void varargsAccessible(final Env<AttrContext> env, final Type t, final InferenceContext inferenceContext) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   833
            if (inferenceContext.free(t)) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   834
                inferenceContext.addFreeTypeListener(List.of(t), new FreeTypeListener() {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   835
                    @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   836
                    public void typesInferred(InferenceContext inferenceContext) {
15705
c4124695db0c 8007463: Cleanup inference related classes
mcimadamore
parents: 15385
diff changeset
   837
                        varargsAccessible(env, inferenceContext.asInstType(t), inferenceContext);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   838
                    }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   839
                });
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   840
            } else {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   841
                if (!isAccessible(env, t)) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   842
                    Symbol location = env.enclClass.sym;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   843
                    reportMC(env.tree, MethodCheckDiag.INACCESSIBLE_VARARGS, inferenceContext, t, Kinds.kindName(location), location);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   844
                }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   845
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   846
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   847
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   848
        private ResultInfo methodCheckResult(final boolean varargsCheck, Type to,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   849
                final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   850
            CheckContext checkContext = new MethodCheckContext(!deferredAttrContext.phase.isBoxingRequired(), deferredAttrContext, rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   851
                MethodCheckDiag methodDiag = varargsCheck ?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   852
                                 MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   853
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   854
                @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   855
                public void report(DiagnosticPosition pos, JCDiagnostic details) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   856
                    reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   857
                }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   858
            };
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   859
            return new MethodResultInfo(to, checkContext);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   860
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   861
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   862
        @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   863
        public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   864
            return new MostSpecificCheck(strict, actuals);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   865
        }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   866
    };
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   867
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   868
    class MethodReferenceCheck extends AbstractMethodCheck {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   869
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   870
        InferenceContext pendingInferenceContext;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   871
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   872
        MethodReferenceCheck(InferenceContext pendingInferenceContext) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   873
            this.pendingInferenceContext = pendingInferenceContext;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   874
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   875
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   876
        @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   877
        void checkArg(DiagnosticPosition pos, boolean varargs, Type actual, Type formal, DeferredAttrContext deferredAttrContext, Warner warn) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   878
            ResultInfo mresult = methodCheckResult(varargs, formal, deferredAttrContext, warn);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   879
            mresult.check(pos, actual);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   880
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   881
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   882
        private ResultInfo methodCheckResult(final boolean varargsCheck, Type to,
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   883
                final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   884
            CheckContext checkContext = new MethodCheckContext(!deferredAttrContext.phase.isBoxingRequired(), deferredAttrContext, rsWarner) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   885
                MethodCheckDiag methodDiag = varargsCheck ?
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   886
                                 MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   887
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   888
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   889
                public boolean compatible(Type found, Type req, Warner warn) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   890
                    found = pendingInferenceContext.asFree(found);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   891
                    req = infer.returnConstraintTarget(found, req);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   892
                    return super.compatible(found, req, warn);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   893
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   894
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   895
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   896
                public void report(DiagnosticPosition pos, JCDiagnostic details) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   897
                    reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   898
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   899
            };
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   900
            return new MethodResultInfo(to, checkContext);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   901
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   902
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   903
        @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   904
        public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   905
            return new MostSpecificCheck(strict, actuals);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   906
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   907
    };
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   908
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   909
    /**
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   910
     * Check context to be used during method applicability checks. A method check
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   911
     * context might contain inference variables.
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   912
     */
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   913
    abstract class MethodCheckContext implements CheckContext {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   914
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   915
        boolean strict;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   916
        DeferredAttrContext deferredAttrContext;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   917
        Warner rsWarner;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   918
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   919
        public MethodCheckContext(boolean strict, DeferredAttrContext deferredAttrContext, Warner rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   920
           this.strict = strict;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   921
           this.deferredAttrContext = deferredAttrContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   922
           this.rsWarner = rsWarner;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   923
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   924
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   925
        public boolean compatible(Type found, Type req, Warner warn) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   926
            return strict ?
15705
c4124695db0c 8007463: Cleanup inference related classes
mcimadamore
parents: 15385
diff changeset
   927
                    types.isSubtypeUnchecked(found, deferredAttrContext.inferenceContext.asFree(req), warn) :
c4124695db0c 8007463: Cleanup inference related classes
mcimadamore
parents: 15385
diff changeset
   928
                    types.isConvertible(found, deferredAttrContext.inferenceContext.asFree(req), warn);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   929
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   930
13438
83729994273a 7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents: 12915
diff changeset
   931
        public void report(DiagnosticPosition pos, JCDiagnostic details) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   932
            throw inapplicableMethodException.setMessage(details);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   933
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   934
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   935
        public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   936
            return rsWarner;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   937
        }
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   938
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   939
        public InferenceContext inferenceContext() {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   940
            return deferredAttrContext.inferenceContext;
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   941
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   942
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   943
        public DeferredAttrContext deferredAttrContext() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   944
            return deferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   945
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   946
    }
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   947
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   948
    /**
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   949
     * ResultInfo class to be used during method applicability checks. Check
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   950
     * for deferred types goes through special path.
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   951
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   952
    class MethodResultInfo extends ResultInfo {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   953
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   954
        public MethodResultInfo(Type pt, CheckContext checkContext) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   955
            attr.super(VAL, pt, checkContext);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   956
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   957
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   958
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   959
        protected Type check(DiagnosticPosition pos, Type found) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   960
            if (found.hasTag(DEFERRED)) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   961
                DeferredType dt = (DeferredType)found;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   962
                return dt.check(this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   963
            } else {
14048
308d1cf8fe46 7177306: Regression: unchecked method call does not erase return type
mcimadamore
parents: 14047
diff changeset
   964
                return super.check(pos, chk.checkNonVoid(pos, types.capture(types.upperBound(found.baseType()))));
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
   965
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   966
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   967
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   968
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   969
        protected MethodResultInfo dup(Type newPt) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   970
            return new MethodResultInfo(newPt, checkContext);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   971
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   972
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   973
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   974
        protected ResultInfo dup(CheckContext newContext) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   975
            return new MethodResultInfo(pt, newContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   976
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   977
    }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   978
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   979
    /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   980
     * Most specific method applicability routine. Given a list of actual types A,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   981
     * a list of formal types F1, and a list of formal types F2, the routine determines
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   982
     * as to whether the types in F1 can be considered more specific than those in F2 w.r.t.
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   983
     * argument types A.
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   984
     */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   985
    class MostSpecificCheck implements MethodCheck {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   986
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   987
        boolean strict;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   988
        List<Type> actuals;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   989
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   990
        MostSpecificCheck(boolean strict, List<Type> actuals) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   991
            this.strict = strict;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   992
            this.actuals = actuals;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   993
        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   994
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   995
        @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   996
        public void argumentsAcceptable(final Env<AttrContext> env,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   997
                                    DeferredAttrContext deferredAttrContext,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   998
                                    List<Type> formals1,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
   999
                                    List<Type> formals2,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1000
                                    Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1001
            formals2 = adjustArgs(formals2, deferredAttrContext.msym, formals1.length(), deferredAttrContext.phase.isVarargsRequired());
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1002
            while (formals2.nonEmpty()) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1003
                ResultInfo mresult = methodCheckResult(formals2.head, deferredAttrContext, warn, actuals.head);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1004
                mresult.check(null, formals1.head);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1005
                formals1 = formals1.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1006
                formals2 = formals2.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1007
                actuals = actuals.isEmpty() ? actuals : actuals.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1008
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1009
        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1010
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1011
       /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1012
        * Create a method check context to be used during the most specific applicability check
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1013
        */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1014
        ResultInfo methodCheckResult(Type to, DeferredAttr.DeferredAttrContext deferredAttrContext,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1015
               Warner rsWarner, Type actual) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1016
           return attr.new ResultInfo(Kinds.VAL, to,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1017
                   new MostSpecificCheckContext(strict, deferredAttrContext, rsWarner, actual));
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1018
        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1019
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1020
        /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1021
         * Subclass of method check context class that implements most specific
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1022
         * method conversion. If the actual type under analysis is a deferred type
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1023
         * a full blown structural analysis is carried out.
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1024
         */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1025
        class MostSpecificCheckContext extends MethodCheckContext {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1026
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1027
            Type actual;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1028
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1029
            public MostSpecificCheckContext(boolean strict, DeferredAttrContext deferredAttrContext, Warner rsWarner, Type actual) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1030
                super(strict, deferredAttrContext, rsWarner);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1031
                this.actual = actual;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1032
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1033
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1034
            public boolean compatible(Type found, Type req, Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1035
                if (!allowStructuralMostSpecific || actual == null) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1036
                    return super.compatible(found, req, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1037
                } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1038
                    switch (actual.getTag()) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1039
                        case DEFERRED:
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1040
                            DeferredType dt = (DeferredType) actual;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1041
                            DeferredType.SpeculativeCache.Entry e = dt.speculativeCache.get(deferredAttrContext.msym, deferredAttrContext.phase);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1042
                            return (e == null || e.speculativeTree == deferredAttr.stuckTree)
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1043
                                    ? false : mostSpecific(found, req, e.speculativeTree, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1044
                        default:
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1045
                            return standaloneMostSpecific(found, req, actual, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1046
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1047
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1048
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1049
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1050
            private boolean mostSpecific(Type t, Type s, JCTree tree, Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1051
                MostSpecificChecker msc = new MostSpecificChecker(t, s, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1052
                msc.scan(tree);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1053
                return msc.result;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1054
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1055
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1056
            boolean polyMostSpecific(Type t1, Type t2, Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1057
                return (!t1.isPrimitive() && t2.isPrimitive())
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1058
                        ? true : super.compatible(t1, t2, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1059
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1060
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1061
            boolean standaloneMostSpecific(Type t1, Type t2, Type exprType, Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1062
                return (exprType.isPrimitive() == t1.isPrimitive()
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1063
                        && exprType.isPrimitive() != t2.isPrimitive())
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1064
                        ? true : super.compatible(t1, t2, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1065
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1066
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1067
            /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1068
             * Structural checker for most specific.
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1069
             */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1070
            class MostSpecificChecker extends DeferredAttr.PolyScanner {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1071
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1072
                final Type t;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1073
                final Type s;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1074
                final Warner warn;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1075
                boolean result;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1076
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1077
                MostSpecificChecker(Type t, Type s, Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1078
                    this.t = t;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1079
                    this.s = s;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1080
                    this.warn = warn;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1081
                    result = true;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1082
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1083
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1084
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1085
                void skip(JCTree tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1086
                    result &= standaloneMostSpecific(t, s, tree.type, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1087
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1088
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1089
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1090
                public void visitConditional(JCConditional tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1091
                    if (tree.polyKind == PolyKind.STANDALONE) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1092
                        result &= standaloneMostSpecific(t, s, tree.type, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1093
                    } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1094
                        super.visitConditional(tree);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1095
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1096
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1097
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1098
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1099
                public void visitApply(JCMethodInvocation tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1100
                    result &= (tree.polyKind == PolyKind.STANDALONE)
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1101
                            ? standaloneMostSpecific(t, s, tree.type, warn)
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1102
                            : polyMostSpecific(t, s, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1103
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1104
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1105
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1106
                public void visitNewClass(JCNewClass tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1107
                    result &= (tree.polyKind == PolyKind.STANDALONE)
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1108
                            ? standaloneMostSpecific(t, s, tree.type, warn)
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1109
                            : polyMostSpecific(t, s, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1110
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1111
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1112
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1113
                public void visitReference(JCMemberReference tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1114
                    if (types.isFunctionalInterface(t.tsym) &&
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1115
                            types.isFunctionalInterface(s.tsym) &&
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1116
                            types.asSuper(t, s.tsym) == null &&
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1117
                            types.asSuper(s, t.tsym) == null) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1118
                        Type desc_t = types.findDescriptorType(t);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1119
                        Type desc_s = types.findDescriptorType(s);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1120
                        if (types.isSameTypes(desc_t.getParameterTypes(), desc_s.getParameterTypes())) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1121
                            if (!desc_s.getReturnType().hasTag(VOID)) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1122
                                //perform structural comparison
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1123
                                Type ret_t = desc_t.getReturnType();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1124
                                Type ret_s = desc_s.getReturnType();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1125
                                result &= ((tree.refPolyKind == PolyKind.STANDALONE)
16322
373dfc3f05f8 8008813: Structural most specific fails when method reference is passed to overloaded method
mcimadamore
parents: 16312
diff changeset
  1126
                                        ? standaloneMostSpecific(ret_t, ret_s, tree.sym.type.getReturnType(), warn)
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1127
                                        : polyMostSpecific(ret_t, ret_s, warn));
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1128
                            } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1129
                                return;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1130
                            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1131
                        } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1132
                            result &= false;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1133
                        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1134
                    } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1135
                        result &= MostSpecificCheckContext.super.compatible(t, s, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1136
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1137
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1138
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1139
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1140
                public void visitLambda(JCLambda tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1141
                    if (types.isFunctionalInterface(t.tsym) &&
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1142
                            types.isFunctionalInterface(s.tsym) &&
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1143
                            types.asSuper(t, s.tsym) == null &&
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1144
                            types.asSuper(s, t.tsym) == null) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1145
                        Type desc_t = types.findDescriptorType(t);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1146
                        Type desc_s = types.findDescriptorType(s);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1147
                        if (tree.paramKind == JCLambda.ParameterKind.EXPLICIT
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1148
                                || types.isSameTypes(desc_t.getParameterTypes(), desc_s.getParameterTypes())) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1149
                            if (!desc_s.getReturnType().hasTag(VOID)) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1150
                                //perform structural comparison
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1151
                                Type ret_t = desc_t.getReturnType();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1152
                                Type ret_s = desc_s.getReturnType();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1153
                                scanLambdaBody(tree, ret_t, ret_s);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1154
                            } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1155
                                return;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1156
                            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1157
                        } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1158
                            result &= false;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1159
                        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1160
                    } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1161
                        result &= MostSpecificCheckContext.super.compatible(t, s, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1162
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1163
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1164
                //where
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1165
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1166
                void scanLambdaBody(JCLambda lambda, final Type t, final Type s) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1167
                    if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1168
                        result &= MostSpecificCheckContext.this.mostSpecific(t, s, lambda.body, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1169
                    } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1170
                        DeferredAttr.LambdaReturnScanner lambdaScanner =
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1171
                                new DeferredAttr.LambdaReturnScanner() {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1172
                                    @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1173
                                    public void visitReturn(JCReturn tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1174
                                        if (tree.expr != null) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1175
                                            result &= MostSpecificCheckContext.this.mostSpecific(t, s, tree.expr, warn);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1176
                                        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1177
                                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1178
                                };
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1179
                        lambdaScanner.scan(lambda.body);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1180
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1181
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1182
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1183
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1184
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1185
        public MethodCheck mostSpecificCheck(List<Type> actuals, boolean strict) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1186
            Assert.error("Cannot get here!");
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1187
            return null;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1188
        }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1189
    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1190
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1191
    public static class InapplicableMethodException extends RuntimeException {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1192
        private static final long serialVersionUID = 0;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1193
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1194
        JCDiagnostic diagnostic;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1195
        JCDiagnostic.Factory diags;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1196
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1197
        InapplicableMethodException(JCDiagnostic.Factory diags) {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1198
            this.diagnostic = null;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1199
            this.diags = diags;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1200
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1201
        InapplicableMethodException setMessage() {
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1202
            return setMessage((JCDiagnostic)null);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1203
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1204
        InapplicableMethodException setMessage(String key) {
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1205
            return setMessage(key != null ? diags.fragment(key) : null);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1206
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1207
        InapplicableMethodException setMessage(String key, Object... args) {
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1208
            return setMessage(key != null ? diags.fragment(key, args) : null);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1209
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1210
        InapplicableMethodException setMessage(JCDiagnostic diag) {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1211
            this.diagnostic = diag;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1212
            return this;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1213
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1214
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1215
        public JCDiagnostic getDiagnostic() {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1216
            return diagnostic;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1217
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1218
    }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1219
    private final InapplicableMethodException inapplicableMethodException;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1220
06bc494ca11e Initial load
duke
parents:
diff changeset
  1221
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1222
 *  Symbol lookup
06bc494ca11e Initial load
duke
parents:
diff changeset
  1223
 *  the following naming conventions for arguments are used
06bc494ca11e Initial load
duke
parents:
diff changeset
  1224
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1225
 *       env      is the environment where the symbol was mentioned
06bc494ca11e Initial load
duke
parents:
diff changeset
  1226
 *       site     is the type of which the symbol is a member
06bc494ca11e Initial load
duke
parents:
diff changeset
  1227
 *       name     is the symbol's name
06bc494ca11e Initial load
duke
parents:
diff changeset
  1228
 *                if no arguments are given
06bc494ca11e Initial load
duke
parents:
diff changeset
  1229
 *       argtypes are the value arguments, if we search for a method
06bc494ca11e Initial load
duke
parents:
diff changeset
  1230
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1231
 *  If no symbol was found, a ResolveError detailing the problem is returned.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1232
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1233
06bc494ca11e Initial load
duke
parents:
diff changeset
  1234
    /** Find field. Synthetic fields are always skipped.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1235
     *  @param env     The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1236
     *  @param site    The original type from where the selection takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1237
     *  @param name    The name of the field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1238
     *  @param c       The class to search for the field. This is always
06bc494ca11e Initial load
duke
parents:
diff changeset
  1239
     *                 a superclass or implemented interface of site's class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1240
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1241
    Symbol findField(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1242
                     Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1243
                     Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1244
                     TypeSymbol c) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1245
        while (c.type.hasTag(TYPEVAR))
326
d51f30ce6796 6531090: Cannot access methods/fields of a captured type belonging to an intersection type
mcimadamore
parents: 10
diff changeset
  1246
            c = c.type.getUpperBound().tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1247
        Symbol bestSoFar = varNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1248
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1249
        Scope.Entry e = c.members().lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1250
        while (e.scope != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1251
            if (e.sym.kind == VAR && (e.sym.flags_field & SYNTHETIC) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1252
                return isAccessible(env, site, e.sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1253
                    ? e.sym : new AccessError(env, site, e.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1254
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1255
            e = e.next();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1256
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1257
        Type st = types.supertype(c.type);
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1258
        if (st != null && (st.hasTag(CLASS) || st.hasTag(TYPEVAR))) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1259
            sym = findField(env, site, name, st.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1260
            if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1261
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1262
        for (List<Type> l = types.interfaces(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1263
             bestSoFar.kind != AMBIGUOUS && l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1264
             l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1265
            sym = findField(env, site, name, l.head.tsym);
18378
00267721fe3a 6360970: javac erroneously accept ambiguous field reference
mcimadamore
parents: 17998
diff changeset
  1266
            if (bestSoFar.exists() && sym.exists() &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1267
                sym.owner != bestSoFar.owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1268
                bestSoFar = new AmbiguityError(bestSoFar, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1269
            else if (sym.kind < bestSoFar.kind)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1270
                bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1271
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1272
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1273
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1274
06bc494ca11e Initial load
duke
parents:
diff changeset
  1275
    /** Resolve a field identifier, throw a fatal error if not found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1276
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1277
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1278
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  1279
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1280
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1281
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1282
    public VarSymbol resolveInternalField(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1283
                                          Type site, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1284
        Symbol sym = findField(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1285
        if (sym.kind == VAR) return (VarSymbol)sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1286
        else throw new FatalError(
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
  1287
                 diags.fragment("fatal.err.cant.locate.field",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1288
                                name));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1289
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1290
06bc494ca11e Initial load
duke
parents:
diff changeset
  1291
    /** Find unqualified variable or field with given name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1292
     *  Synthetic fields always skipped.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1293
     *  @param env     The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1294
     *  @param name    The name of the variable or field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1295
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1296
    Symbol findVar(Env<AttrContext> env, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1297
        Symbol bestSoFar = varNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1298
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1299
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1300
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1301
        while (env1.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1302
            if (isStatic(env1)) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1303
            Scope.Entry e = env1.info.scope.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1304
            while (e.scope != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1305
                   (e.sym.kind != VAR ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  1306
                    (e.sym.flags_field & SYNTHETIC) != 0))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1307
                e = e.next();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1308
            sym = (e.scope != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1309
                ? e.sym
06bc494ca11e Initial load
duke
parents:
diff changeset
  1310
                : findField(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1311
                    env1, env1.enclClass.sym.type, name, env1.enclClass.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1312
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1313
                if (staticOnly &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1314
                    sym.kind == VAR &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1315
                    sym.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1316
                    (sym.flags() & STATIC) == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1317
                    return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1318
                else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1319
                    return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1320
            } else if (sym.kind < bestSoFar.kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1321
                bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1322
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1323
06bc494ca11e Initial load
duke
parents:
diff changeset
  1324
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1325
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1326
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1327
06bc494ca11e Initial load
duke
parents:
diff changeset
  1328
        sym = findField(env, syms.predefClass.type, name, syms.predefClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1329
        if (sym.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1330
            return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1331
        if (bestSoFar.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1332
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1333
06bc494ca11e Initial load
duke
parents:
diff changeset
  1334
        Scope.Entry e = env.toplevel.namedImportScope.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1335
        for (; e.scope != null; e = e.next()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1336
            sym = e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1337
            Type origin = e.getOrigin().owner.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1338
            if (sym.kind == VAR) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1339
                if (e.sym.owner.type != origin)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1340
                    sym = sym.clone(e.getOrigin().owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1341
                return isAccessible(env, origin, sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1342
                    ? sym : new AccessError(env, origin, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1343
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1344
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1345
06bc494ca11e Initial load
duke
parents:
diff changeset
  1346
        Symbol origin = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1347
        e = env.toplevel.starImportScope.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1348
        for (; e.scope != null; e = e.next()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1349
            sym = e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1350
            if (sym.kind != VAR)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1351
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1352
            // invariant: sym.kind == VAR
06bc494ca11e Initial load
duke
parents:
diff changeset
  1353
            if (bestSoFar.kind < AMBIGUOUS && sym.owner != bestSoFar.owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1354
                return new AmbiguityError(bestSoFar, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1355
            else if (bestSoFar.kind >= VAR) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1356
                origin = e.getOrigin().owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1357
                bestSoFar = isAccessible(env, origin.type, sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1358
                    ? sym : new AccessError(env, origin.type, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1359
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1360
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1361
        if (bestSoFar.kind == VAR && bestSoFar.owner.type != origin.type)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1362
            return bestSoFar.clone(origin);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1363
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1364
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1365
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1366
06bc494ca11e Initial load
duke
parents:
diff changeset
  1367
    Warner noteWarner = new Warner();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1368
06bc494ca11e Initial load
duke
parents:
diff changeset
  1369
    /** Select the best method for a call site among two choices.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1370
     *  @param env              The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1371
     *  @param site             The original type from where the
06bc494ca11e Initial load
duke
parents:
diff changeset
  1372
     *                          selection takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1373
     *  @param argtypes         The invocation's value arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1374
     *  @param typeargtypes     The invocation's type arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1375
     *  @param sym              Proposed new best match.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1376
     *  @param bestSoFar        Previously found best match.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1377
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1378
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1379
     */
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1380
    @SuppressWarnings("fallthrough")
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1381
    Symbol selectBest(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1382
                      Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1383
                      List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1384
                      List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1385
                      Symbol sym,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1386
                      Symbol bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1387
                      boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1388
                      boolean useVarargs,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1389
                      boolean operator) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1390
        if (sym.kind == ERR ||
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  1391
                !sym.isInheritedIn(site.tsym, types)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1392
            return bestSoFar;
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  1393
        } else if (useVarargs && (sym.flags() & VARARGS) == 0) {
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  1394
            return bestSoFar.kind >= ERRONEOUS ?
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  1395
                    new BadVarargsMethod((ResolveError)bestSoFar) :
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  1396
                    bestSoFar;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1397
        }
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 7681
diff changeset
  1398
        Assert.check(sym.kind < AMBIGUOUS);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1399
        try {
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
  1400
            Type mt = rawInstantiate(env, site, sym, null, argtypes, typeargtypes,
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1401
                               allowBoxing, useVarargs, types.noWarnings);
17804
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  1402
            if (!operator || verboseResolutionMode.contains(VerboseResolutionMode.PREDEF))
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  1403
                currentResolutionContext.addApplicableCandidate(sym, mt);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1404
        } catch (InapplicableMethodException ex) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  1405
            if (!operator)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  1406
                currentResolutionContext.addInapplicableCandidate(sym, ex.getDiagnostic());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1407
            switch (bestSoFar.kind) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1408
                case ABSENT_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1409
                    return new InapplicableSymbolError(currentResolutionContext);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1410
                case WRONG_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1411
                    if (operator) return bestSoFar;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1412
                    bestSoFar = new InapplicableSymbolsError(currentResolutionContext);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1413
                default:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1414
                    return bestSoFar;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1415
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1416
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1417
        if (!isAccessible(env, site, sym)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1418
            return (bestSoFar.kind == ABSENT_MTH)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1419
                ? new AccessError(env, site, sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1420
                : bestSoFar;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  1421
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1422
        return (bestSoFar.kind > AMBIGUOUS)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1423
            ? sym
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1424
            : mostSpecific(argtypes, sym, bestSoFar, env, site,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1425
                           allowBoxing && operator, useVarargs);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1426
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1427
06bc494ca11e Initial load
duke
parents:
diff changeset
  1428
    /* Return the most specific of the two methods for a call,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1429
     *  given that both are accessible and applicable.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1430
     *  @param m1               A new candidate for most specific.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1431
     *  @param m2               The previous most specific candidate.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1432
     *  @param env              The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1433
     *  @param site             The original type from where the selection
06bc494ca11e Initial load
duke
parents:
diff changeset
  1434
     *                          takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1435
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1436
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1437
     */
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1438
    Symbol mostSpecific(List<Type> argtypes, Symbol m1,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1439
                        Symbol m2,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1440
                        Env<AttrContext> env,
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
  1441
                        final Type site,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1442
                        boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1443
                        boolean useVarargs) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1444
        switch (m2.kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1445
        case MTH:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1446
            if (m1 == m2) return m1;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1447
            boolean m1SignatureMoreSpecific =
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1448
                    signatureMoreSpecific(argtypes, env, site, m1, m2, allowBoxing, useVarargs);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1449
            boolean m2SignatureMoreSpecific =
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1450
                    signatureMoreSpecific(argtypes, env, site, m2, m1, allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1451
            if (m1SignatureMoreSpecific && m2SignatureMoreSpecific) {
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1452
                Type mt1 = types.memberType(site, m1);
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1453
                Type mt2 = types.memberType(site, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1454
                if (!types.overrideEquivalent(mt1, mt2))
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1455
                    return ambiguityError(m1, m2);
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1456
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1457
                // same signature; select (a) the non-bridge method, or
06bc494ca11e Initial load
duke
parents:
diff changeset
  1458
                // (b) the one that overrides the other, or (c) the concrete
06bc494ca11e Initial load
duke
parents:
diff changeset
  1459
                // one, or (d) merge both abstract signatures
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1460
                if ((m1.flags() & BRIDGE) != (m2.flags() & BRIDGE))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1461
                    return ((m1.flags() & BRIDGE) != 0) ? m2 : m1;
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1462
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1463
                // if one overrides or hides the other, use it
06bc494ca11e Initial load
duke
parents:
diff changeset
  1464
                TypeSymbol m1Owner = (TypeSymbol)m1.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1465
                TypeSymbol m2Owner = (TypeSymbol)m2.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1466
                if (types.asSuper(m1Owner.type, m2Owner) != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1467
                    ((m1.owner.flags_field & INTERFACE) == 0 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  1468
                     (m2.owner.flags_field & INTERFACE) != 0) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1469
                    m1.overrides(m2, m1Owner, types, false))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1470
                    return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1471
                if (types.asSuper(m2Owner.type, m1Owner) != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1472
                    ((m2.owner.flags_field & INTERFACE) == 0 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  1473
                     (m1.owner.flags_field & INTERFACE) != 0) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1474
                    m2.overrides(m1, m2Owner, types, false))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1475
                    return m2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1476
                boolean m1Abstract = (m1.flags() & ABSTRACT) != 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1477
                boolean m2Abstract = (m2.flags() & ABSTRACT) != 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1478
                if (m1Abstract && !m2Abstract) return m2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1479
                if (m2Abstract && !m1Abstract) return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1480
                // both abstract or both concrete
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1481
                return ambiguityError(m1, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1482
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1483
            if (m1SignatureMoreSpecific) return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1484
            if (m2SignatureMoreSpecific) return m2;
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1485
            return ambiguityError(m1, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1486
        case AMBIGUOUS:
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1487
            //check if m1 is more specific than all ambiguous methods in m2
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1488
            AmbiguityError e = (AmbiguityError)m2;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1489
            for (Symbol s : e.ambiguousSyms) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1490
                if (mostSpecific(argtypes, m1, s, env, site, allowBoxing, useVarargs) != m1) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1491
                    return e.addAmbiguousSymbol(m1);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1492
                }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1493
            }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1494
            return m1;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1495
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1496
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1497
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1498
    }
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1499
    //where
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1500
    private boolean signatureMoreSpecific(List<Type> actuals, Env<AttrContext> env, Type site, Symbol m1, Symbol m2, boolean allowBoxing, boolean useVarargs) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1501
        noteWarner.clear();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1502
        int maxLength = Math.max(
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1503
                            Math.max(m1.type.getParameterTypes().length(), actuals.length()),
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1504
                            m2.type.getParameterTypes().length());
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1505
        MethodResolutionContext prevResolutionContext = currentResolutionContext;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1506
        try {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1507
            currentResolutionContext = new MethodResolutionContext();
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1508
            currentResolutionContext.step = prevResolutionContext.step;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1509
            currentResolutionContext.methodCheck =
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1510
                    prevResolutionContext.methodCheck.mostSpecificCheck(actuals, !allowBoxing);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1511
            Type mst = instantiate(env, site, m2, null,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1512
                    adjustArgs(types.lowerBounds(types.memberType(site, m1).getParameterTypes()), m1, maxLength, useVarargs), null,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1513
                    allowBoxing, useVarargs, noteWarner);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1514
            return mst != null &&
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1515
                    !noteWarner.hasLint(Lint.LintCategory.UNCHECKED);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1516
        } finally {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1517
            currentResolutionContext = prevResolutionContext;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1518
        }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1519
    }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1520
    private List<Type> adjustArgs(List<Type> args, Symbol msym, int length, boolean allowVarargs) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1521
        if ((msym.flags() & VARARGS) != 0 && allowVarargs) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1522
            Type varargsElem = types.elemtype(args.last());
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1523
            if (varargsElem == null) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1524
                Assert.error("Bad varargs = " + args.last() + " " + msym);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1525
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1526
            List<Type> newArgs = args.reverse().tail.prepend(varargsElem).reverse();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1527
            while (newArgs.length() < length) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1528
                newArgs = newArgs.append(newArgs.last());
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1529
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1530
            return newArgs;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1531
        } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1532
            return args;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1533
        }
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1534
    }
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1535
    //where
10197
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1536
    Type mostSpecificReturnType(Type mt1, Type mt2) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1537
        Type rt1 = mt1.getReturnType();
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1538
        Type rt2 = mt2.getReturnType();
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1539
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1540
        if (mt1.hasTag(FORALL) && mt2.hasTag(FORALL)) {
10197
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1541
            //if both are generic methods, adjust return type ahead of subtyping check
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1542
            rt1 = types.subst(rt1, mt1.getTypeArguments(), mt2.getTypeArguments());
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1543
        }
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1544
        //first use subtyping, then return type substitutability
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1545
        if (types.isSubtype(rt1, rt2)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1546
            return mt1;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1547
        } else if (types.isSubtype(rt2, rt1)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1548
            return mt2;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1549
        } else if (types.returnTypeSubstitutable(mt1, mt2)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1550
            return mt1;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1551
        } else if (types.returnTypeSubstitutable(mt2, mt1)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1552
            return mt2;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1553
        } else {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1554
            return null;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1555
        }
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1556
    }
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1557
    //where
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1558
    Symbol ambiguityError(Symbol m1, Symbol m2) {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1559
        if (((m1.flags() | m2.flags()) & CLASH) != 0) {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1560
            return (m1.flags() & CLASH) == 0 ? m1 : m2;
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1561
        } else {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1562
            return new AmbiguityError(m1, m2);
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1563
        }
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1564
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1565
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1566
    Symbol findMethodInScope(Env<AttrContext> env,
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1567
            Type site,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1568
            Name name,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1569
            List<Type> argtypes,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1570
            List<Type> typeargtypes,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1571
            Scope sc,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1572
            Symbol bestSoFar,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1573
            boolean allowBoxing,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1574
            boolean useVarargs,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1575
            boolean operator,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1576
            boolean abstractok) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1577
        for (Symbol s : sc.getElementsByName(name, new LookupFilter(abstractok))) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1578
            bestSoFar = selectBest(env, site, argtypes, typeargtypes, s,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1579
                    bestSoFar, allowBoxing, useVarargs, operator);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1580
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1581
        return bestSoFar;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1582
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1583
    //where
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1584
        class LookupFilter implements Filter<Symbol> {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1585
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1586
            boolean abstractOk;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1587
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1588
            LookupFilter(boolean abstractOk) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1589
                this.abstractOk = abstractOk;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1590
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1591
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1592
            public boolean accepts(Symbol s) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1593
                long flags = s.flags();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1594
                return s.kind == MTH &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1595
                        (flags & SYNTHETIC) == 0 &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1596
                        (abstractOk ||
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1597
                        (flags & DEFAULT) != 0 ||
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1598
                        (flags & ABSTRACT) == 0);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1599
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1600
        };
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1601
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1602
    /** Find best qualified method matching given name, type and value
06bc494ca11e Initial load
duke
parents:
diff changeset
  1603
     *  arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1604
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1605
     *  @param site      The original type from where the selection
06bc494ca11e Initial load
duke
parents:
diff changeset
  1606
     *                   takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1607
     *  @param name      The method's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1608
     *  @param argtypes  The method's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1609
     *  @param typeargtypes The method's type arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
  1610
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1611
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1612
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1613
    Symbol findMethod(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1614
                      Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1615
                      Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1616
                      List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1617
                      List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1618
                      boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1619
                      boolean useVarargs,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1620
                      boolean operator) {
5736
ee0850472ca1 6939134: JSR 292 adjustments to method handle invocation
jrose
parents: 5321
diff changeset
  1621
        Symbol bestSoFar = methodNotFound;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  1622
        bestSoFar = findMethod(env,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1623
                          site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1624
                          name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1625
                          argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1626
                          typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1627
                          site.tsym.type,
5736
ee0850472ca1 6939134: JSR 292 adjustments to method handle invocation
jrose
parents: 5321
diff changeset
  1628
                          bestSoFar,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1629
                          allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1630
                          useVarargs,
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1631
                          operator);
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  1632
        return bestSoFar;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1633
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1634
    // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  1635
    private Symbol findMethod(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1636
                              Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1637
                              Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1638
                              List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1639
                              List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1640
                              Type intype,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1641
                              Symbol bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1642
                              boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1643
                              boolean useVarargs,
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1644
                              boolean operator) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1645
        @SuppressWarnings({"unchecked","rawtypes"})
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1646
        List<Type>[] itypes = (List<Type>[])new List[] { List.<Type>nil(), List.<Type>nil() };
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1647
        InterfaceLookupPhase iphase = InterfaceLookupPhase.ABSTRACT_OK;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1648
        for (TypeSymbol s : superclasses(intype)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1649
            bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes,
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1650
                    s.members(), bestSoFar, allowBoxing, useVarargs, operator, true);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1651
            if (name == names.init) return bestSoFar;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1652
            iphase = (iphase == null) ? null : iphase.update(s, this);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1653
            if (iphase != null) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1654
                for (Type itype : types.interfaces(s.type)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1655
                    itypes[iphase.ordinal()] = types.union(types.closure(itype), itypes[iphase.ordinal()]);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1656
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1657
            }
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1658
        }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1659
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1660
        Symbol concrete = bestSoFar.kind < ERR &&
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1661
                (bestSoFar.flags() & ABSTRACT) == 0 ?
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1662
                bestSoFar : methodNotFound;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1663
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1664
        for (InterfaceLookupPhase iphase2 : InterfaceLookupPhase.values()) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1665
            if (iphase2 == InterfaceLookupPhase.DEFAULT_OK && !allowDefaultMethods) break;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1666
            //keep searching for abstract methods
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1667
            for (Type itype : itypes[iphase2.ordinal()]) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1668
                if (!itype.isInterface()) continue; //skip j.l.Object (included by Types.closure())
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1669
                if (iphase2 == InterfaceLookupPhase.DEFAULT_OK &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1670
                        (itype.tsym.flags() & DEFAULT) == 0) continue;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1671
                bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes,
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1672
                        itype.tsym.members(), bestSoFar, allowBoxing, useVarargs, operator, true);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1673
                if (concrete != bestSoFar &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1674
                        concrete.kind < ERR  && bestSoFar.kind < ERR &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1675
                        types.isSubSignature(concrete.type, bestSoFar.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1676
                    //this is an hack - as javac does not do full membership checks
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1677
                    //most specific ends up comparing abstract methods that might have
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1678
                    //been implemented by some concrete method in a subclass and,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1679
                    //because of raw override, it is possible for an abstract method
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1680
                    //to be more specific than the concrete method - so we need
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1681
                    //to explicitly call that out (see CR 6178365)
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1682
                    bestSoFar = concrete;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1683
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1684
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1685
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1686
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1687
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1688
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1689
    enum InterfaceLookupPhase {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1690
        ABSTRACT_OK() {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1691
            @Override
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1692
            InterfaceLookupPhase update(Symbol s, Resolve rs) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1693
                //We should not look for abstract methods if receiver is a concrete class
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1694
                //(as concrete classes are expected to implement all abstracts coming
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1695
                //from superinterfaces)
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1696
                if ((s.flags() & (ABSTRACT | INTERFACE | ENUM)) != 0) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1697
                    return this;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1698
                } else if (rs.allowDefaultMethods) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1699
                    return DEFAULT_OK;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1700
                } else {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1701
                    return null;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1702
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1703
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1704
        },
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1705
        DEFAULT_OK() {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1706
            @Override
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1707
            InterfaceLookupPhase update(Symbol s, Resolve rs) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1708
                return this;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1709
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1710
        };
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1711
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1712
        abstract InterfaceLookupPhase update(Symbol s, Resolve rs);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1713
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1714
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1715
    /**
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1716
     * Return an Iterable object to scan the superclasses of a given type.
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1717
     * It's crucial that the scan is done lazily, as we don't want to accidentally
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1718
     * access more supertypes than strictly needed (as this could trigger completion
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1719
     * errors if some of the not-needed supertypes are missing/ill-formed).
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1720
     */
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1721
    Iterable<TypeSymbol> superclasses(final Type intype) {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1722
        return new Iterable<TypeSymbol>() {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1723
            public Iterator<TypeSymbol> iterator() {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1724
                return new Iterator<TypeSymbol>() {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1725
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1726
                    List<TypeSymbol> seen = List.nil();
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1727
                    TypeSymbol currentSym = symbolFor(intype);
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1728
                    TypeSymbol prevSym = null;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1729
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1730
                    public boolean hasNext() {
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1731
                        if (currentSym == syms.noSymbol) {
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1732
                            currentSym = symbolFor(types.supertype(prevSym.type));
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1733
                        }
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1734
                        return currentSym != null;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1735
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1736
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1737
                    public TypeSymbol next() {
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1738
                        prevSym = currentSym;
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1739
                        currentSym = syms.noSymbol;
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1740
                        Assert.check(prevSym != null || prevSym != syms.noSymbol);
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1741
                        return prevSym;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1742
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1743
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1744
                    public void remove() {
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1745
                        throw new UnsupportedOperationException();
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1746
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1747
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1748
                    TypeSymbol symbolFor(Type t) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1749
                        if (!t.hasTag(CLASS) &&
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1750
                                !t.hasTag(TYPEVAR)) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1751
                            return null;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1752
                        }
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1753
                        while (t.hasTag(TYPEVAR))
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1754
                            t = t.getUpperBound();
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1755
                        if (seen.contains(t.tsym)) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1756
                            //degenerate case in which we have a circular
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1757
                            //class hierarchy - because of ill-formed classfiles
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1758
                            return null;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1759
                        }
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1760
                        seen = seen.prepend(t.tsym);
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1761
                        return t.tsym;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1762
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1763
                };
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1764
            }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1765
        };
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1766
    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1767
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1768
    /** Find unqualified method matching given name, type and value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1769
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1770
     *  @param name      The method's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1771
     *  @param argtypes  The method's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1772
     *  @param typeargtypes  The method's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1773
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1774
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1775
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1776
    Symbol findFun(Env<AttrContext> env, Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1777
                   List<Type> argtypes, List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1778
                   boolean allowBoxing, boolean useVarargs) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1779
        Symbol bestSoFar = methodNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1780
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1781
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1782
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1783
        while (env1.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1784
            if (isStatic(env1)) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1785
            sym = findMethod(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1786
                env1, env1.enclClass.sym.type, name, argtypes, typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1787
                allowBoxing, useVarargs, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1788
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1789
                if (staticOnly &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1790
                    sym.kind == MTH &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1791
                    sym.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1792
                    (sym.flags() & STATIC) == 0) return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1793
                else return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1794
            } else if (sym.kind < bestSoFar.kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1795
                bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1796
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1797
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1798
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1799
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1800
06bc494ca11e Initial load
duke
parents:
diff changeset
  1801
        sym = findMethod(env, syms.predefClass.type, name, argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1802
                         typeargtypes, allowBoxing, useVarargs, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1803
        if (sym.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1804
            return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1805
06bc494ca11e Initial load
duke
parents:
diff changeset
  1806
        Scope.Entry e = env.toplevel.namedImportScope.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1807
        for (; e.scope != null; e = e.next()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1808
            sym = e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1809
            Type origin = e.getOrigin().owner.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1810
            if (sym.kind == MTH) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1811
                if (e.sym.owner.type != origin)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1812
                    sym = sym.clone(e.getOrigin().owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1813
                if (!isAccessible(env, origin, sym))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1814
                    sym = new AccessError(env, origin, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1815
                bestSoFar = selectBest(env, origin,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1816
                                       argtypes, typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1817
                                       sym, bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1818
                                       allowBoxing, useVarargs, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1819
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1820
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1821
        if (bestSoFar.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1822
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1823
06bc494ca11e Initial load
duke
parents:
diff changeset
  1824
        e = env.toplevel.starImportScope.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1825
        for (; e.scope != null; e = e.next()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1826
            sym = e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1827
            Type origin = e.getOrigin().owner.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1828
            if (sym.kind == MTH) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1829
                if (e.sym.owner.type != origin)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1830
                    sym = sym.clone(e.getOrigin().owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1831
                if (!isAccessible(env, origin, sym))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1832
                    sym = new AccessError(env, origin, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1833
                bestSoFar = selectBest(env, origin,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1834
                                       argtypes, typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1835
                                       sym, bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1836
                                       allowBoxing, useVarargs, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1837
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1838
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1839
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1840
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1841
06bc494ca11e Initial load
duke
parents:
diff changeset
  1842
    /** Load toplevel or member class with given fully qualified name and
06bc494ca11e Initial load
duke
parents:
diff changeset
  1843
     *  verify that it is accessible.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1844
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1845
     *  @param name      The fully qualified name of the class to be loaded.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1846
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1847
    Symbol loadClass(Env<AttrContext> env, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1848
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1849
            ClassSymbol c = reader.loadClass(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1850
            return isAccessible(env, c) ? c : new AccessError(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1851
        } catch (ClassReader.BadClassFile err) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1852
            throw err;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1853
        } catch (CompletionFailure ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1854
            return typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1855
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1856
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1857
06bc494ca11e Initial load
duke
parents:
diff changeset
  1858
    /** Find qualified member type.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1859
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1860
     *  @param site      The original type from where the selection takes
06bc494ca11e Initial load
duke
parents:
diff changeset
  1861
     *                   place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1862
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1863
     *  @param c         The class to search for the member type. This is
06bc494ca11e Initial load
duke
parents:
diff changeset
  1864
     *                   always a superclass or implemented interface of
06bc494ca11e Initial load
duke
parents:
diff changeset
  1865
     *                   site's class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1866
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1867
    Symbol findMemberType(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1868
                          Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1869
                          Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1870
                          TypeSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1871
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1872
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1873
        Scope.Entry e = c.members().lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1874
        while (e.scope != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1875
            if (e.sym.kind == TYP) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1876
                return isAccessible(env, site, e.sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1877
                    ? e.sym
06bc494ca11e Initial load
duke
parents:
diff changeset
  1878
                    : new AccessError(env, site, e.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1879
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1880
            e = e.next();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1881
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1882
        Type st = types.supertype(c.type);
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1883
        if (st != null && st.hasTag(CLASS)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1884
            sym = findMemberType(env, site, name, st.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1885
            if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1886
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1887
        for (List<Type> l = types.interfaces(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1888
             bestSoFar.kind != AMBIGUOUS && l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1889
             l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1890
            sym = findMemberType(env, site, name, l.head.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1891
            if (bestSoFar.kind < AMBIGUOUS && sym.kind < AMBIGUOUS &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1892
                sym.owner != bestSoFar.owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1893
                bestSoFar = new AmbiguityError(bestSoFar, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1894
            else if (sym.kind < bestSoFar.kind)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1895
                bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1896
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1897
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1898
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1899
06bc494ca11e Initial load
duke
parents:
diff changeset
  1900
    /** Find a global type in given scope and load corresponding class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1901
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1902
     *  @param scope     The scope in which to look for the type.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1903
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1904
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1905
    Symbol findGlobalType(Env<AttrContext> env, Scope scope, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1906
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1907
        for (Scope.Entry e = scope.lookup(name); e.scope != null; e = e.next()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1908
            Symbol sym = loadClass(env, e.sym.flatName());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1909
            if (bestSoFar.kind == TYP && sym.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1910
                bestSoFar != sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1911
                return new AmbiguityError(bestSoFar, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1912
            else if (sym.kind < bestSoFar.kind)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1913
                bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1914
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1915
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1916
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1917
06bc494ca11e Initial load
duke
parents:
diff changeset
  1918
    /** Find an unqualified type symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1919
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1920
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1921
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1922
    Symbol findType(Env<AttrContext> env, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1923
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1924
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1925
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1926
        for (Env<AttrContext> env1 = env; env1.outer != null; env1 = env1.outer) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1927
            if (isStatic(env1)) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1928
            for (Scope.Entry e = env1.info.scope.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1929
                 e.scope != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1930
                 e = e.next()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1931
                if (e.sym.kind == TYP) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1932
                    if (staticOnly &&
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1933
                        e.sym.type.hasTag(TYPEVAR) &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1934
                        e.sym.owner.kind == TYP) return new StaticError(e.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1935
                    return e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1936
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1937
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1938
06bc494ca11e Initial load
duke
parents:
diff changeset
  1939
            sym = findMemberType(env1, env1.enclClass.sym.type, name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1940
                                 env1.enclClass.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1941
            if (staticOnly && sym.kind == TYP &&
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1942
                sym.type.hasTag(CLASS) &&
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1943
                sym.type.getEnclosingType().hasTag(CLASS) &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1944
                env1.enclClass.sym.type.isParameterized() &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1945
                sym.type.getEnclosingType().isParameterized())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1946
                return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1947
            else if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1948
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1949
06bc494ca11e Initial load
duke
parents:
diff changeset
  1950
            JCClassDecl encl = env1.baseClause ? (JCClassDecl)env1.tree : env1.enclClass;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1951
            if ((encl.sym.flags() & STATIC) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1952
                staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1953
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1954
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
  1955
        if (!env.tree.hasTag(IMPORT)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1956
            sym = findGlobalType(env, env.toplevel.namedImportScope, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1957
            if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1958
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1959
06bc494ca11e Initial load
duke
parents:
diff changeset
  1960
            sym = findGlobalType(env, env.toplevel.packge.members(), name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1961
            if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1962
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1963
06bc494ca11e Initial load
duke
parents:
diff changeset
  1964
            sym = findGlobalType(env, env.toplevel.starImportScope, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1965
            if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1966
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1967
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1968
06bc494ca11e Initial load
duke
parents:
diff changeset
  1969
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1970
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1971
06bc494ca11e Initial load
duke
parents:
diff changeset
  1972
    /** Find an unqualified identifier which matches a specified kind set.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1973
     *  @param env       The current environment.
14541
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14446
diff changeset
  1974
     *  @param name      The identifier's name.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1975
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  1976
     *                   (a subset of VAL, TYP, PCK).
06bc494ca11e Initial load
duke
parents:
diff changeset
  1977
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1978
    Symbol findIdent(Env<AttrContext> env, Name name, int kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1979
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1980
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1981
06bc494ca11e Initial load
duke
parents:
diff changeset
  1982
        if ((kind & VAR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1983
            sym = findVar(env, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1984
            if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1985
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1986
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1987
06bc494ca11e Initial load
duke
parents:
diff changeset
  1988
        if ((kind & TYP) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1989
            sym = findType(env, name);
14957
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  1990
            if (sym.kind==TYP) {
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  1991
                 reportDependence(env.enclClass.sym, sym);
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  1992
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1993
            if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1994
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1995
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1996
06bc494ca11e Initial load
duke
parents:
diff changeset
  1997
        if ((kind & PCK) != 0) return reader.enterPackage(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1998
        else return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1999
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2000
14957
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2001
    /** Report dependencies.
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2002
     * @param from The enclosing class sym
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2003
     * @param to   The found identifier that the class depends on.
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2004
     */
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2005
    public void reportDependence(Symbol from, Symbol to) {
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2006
        // Override if you want to collect the reported dependencies.
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2007
    }
ea7808ffcf6d 8004657: Add hooks to javac to enable reporting dependency information.
ohrstrom
parents: 14953
diff changeset
  2008
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2009
    /** Find an identifier in a package which matches a specified kind set.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2010
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2011
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2012
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2013
     *                   (a nonempty subset of TYP, PCK).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2014
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2015
    Symbol findIdentInPackage(Env<AttrContext> env, TypeSymbol pck,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2016
                              Name name, int kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2017
        Name fullname = TypeSymbol.formFullName(name, pck);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2018
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2019
        PackageSymbol pack = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2020
        if ((kind & PCK) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2021
            pack = reader.enterPackage(fullname);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2022
            if (pack.exists()) return pack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2023
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2024
        if ((kind & TYP) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2025
            Symbol sym = loadClass(env, fullname);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2026
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2027
                // don't allow programs to use flatnames
06bc494ca11e Initial load
duke
parents:
diff changeset
  2028
                if (name == sym.name) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2029
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2030
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2031
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2032
        return (pack != null) ? pack : bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2033
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2034
06bc494ca11e Initial load
duke
parents:
diff changeset
  2035
    /** Find an identifier among the members of a given type `site'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2036
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2037
     *  @param site      The type containing the symbol to be found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2038
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2039
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2040
     *                   (a subset of VAL, TYP).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2041
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2042
    Symbol findIdentInType(Env<AttrContext> env, Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2043
                           Name name, int kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2044
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2045
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2046
        if ((kind & VAR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2047
            sym = findField(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2048
            if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2049
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2050
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2051
06bc494ca11e Initial load
duke
parents:
diff changeset
  2052
        if ((kind & TYP) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2053
            sym = findMemberType(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2054
            if (sym.exists()) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2055
            else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2056
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2057
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2058
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2059
06bc494ca11e Initial load
duke
parents:
diff changeset
  2060
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2061
 *  Access checking
06bc494ca11e Initial load
duke
parents:
diff changeset
  2062
 *  The following methods convert ResolveErrors to ErrorSymbols, issuing
06bc494ca11e Initial load
duke
parents:
diff changeset
  2063
 *  an error message in the process
06bc494ca11e Initial load
duke
parents:
diff changeset
  2064
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2065
06bc494ca11e Initial load
duke
parents:
diff changeset
  2066
    /** If `sym' is a bad symbol: report error and return errSymbol
06bc494ca11e Initial load
duke
parents:
diff changeset
  2067
     *  else pass through unchanged,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2068
     *  additional arguments duplicate what has been used in trying to find the
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13438
diff changeset
  2069
     *  symbol {@literal (--> flyweight pattern)}. This improves performance since we
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2070
     *  expect misses to happen frequently.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2071
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  2072
     *  @param sym       The symbol that was found, or a ResolveError.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2073
     *  @param pos       The position to use for error reporting.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2074
     *  @param location  The symbol the served as a context for this lookup
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2075
     *  @param site      The original type from where the selection took place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2076
     *  @param name      The symbol's name.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2077
     *  @param qualified Did we get here through a qualified expression resolution?
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2078
     *  @param argtypes  The invocation's value arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2079
     *                   if we looked for a method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2080
     *  @param typeargtypes  The invocation's type arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2081
     *                   if we looked for a method.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2082
     *  @param logResolveHelper helper class used to log resolve errors
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2083
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2084
    Symbol accessInternal(Symbol sym,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2085
                  DiagnosticPosition pos,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2086
                  Symbol location,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2087
                  Type site,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2088
                  Name name,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2089
                  boolean qualified,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2090
                  List<Type> argtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2091
                  List<Type> typeargtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2092
                  LogResolveHelper logResolveHelper) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2093
        if (sym.kind >= AMBIGUOUS) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2094
            ResolveError errSym = (ResolveError)sym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2095
            sym = errSym.access(name, qualified ? site.tsym : syms.noSymbol);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2096
            argtypes = logResolveHelper.getArgumentTypes(errSym, sym, name, argtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2097
            if (logResolveHelper.resolveDiagnosticNeeded(site, argtypes, typeargtypes)) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2098
                logResolveError(errSym, pos, location, site, name, argtypes, typeargtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2099
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2100
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2101
        return sym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2102
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2103
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2104
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2105
     * Variant of the generalized access routine, to be used for generating method
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2106
     * resolution diagnostics
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2107
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2108
    Symbol accessMethod(Symbol sym,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2109
                  DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2110
                  Symbol location,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2111
                  Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2112
                  Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2113
                  boolean qualified,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2114
                  List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2115
                  List<Type> typeargtypes) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2116
        return accessInternal(sym, pos, location, site, name, qualified, argtypes, typeargtypes, methodLogResolveHelper);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2117
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2118
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2119
    /** Same as original accessMethod(), but without location.
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2120
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2121
    Symbol accessMethod(Symbol sym,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2122
                  DiagnosticPosition pos,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2123
                  Type site,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2124
                  Name name,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2125
                  boolean qualified,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2126
                  List<Type> argtypes,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2127
                  List<Type> typeargtypes) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2128
        return accessMethod(sym, pos, site.tsym, site, name, qualified, argtypes, typeargtypes);
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2129
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2130
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2131
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2132
     * Variant of the generalized access routine, to be used for generating variable,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2133
     * type resolution diagnostics
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2134
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2135
    Symbol accessBase(Symbol sym,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2136
                  DiagnosticPosition pos,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2137
                  Symbol location,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2138
                  Type site,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2139
                  Name name,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2140
                  boolean qualified) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2141
        return accessInternal(sym, pos, location, site, name, qualified, List.<Type>nil(), null, basicLogResolveHelper);
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2142
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2143
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2144
    /** Same as original accessBase(), but without location.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2145
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2146
    Symbol accessBase(Symbol sym,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2147
                  DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2148
                  Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2149
                  Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2150
                  boolean qualified) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2151
        return accessBase(sym, pos, site.tsym, site, name, qualified);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2152
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2153
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2154
    interface LogResolveHelper {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2155
        boolean resolveDiagnosticNeeded(Type site, List<Type> argtypes, List<Type> typeargtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2156
        List<Type> getArgumentTypes(ResolveError errSym, Symbol accessedSym, Name name, List<Type> argtypes);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2157
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2158
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2159
    LogResolveHelper basicLogResolveHelper = new LogResolveHelper() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2160
        public boolean resolveDiagnosticNeeded(Type site, List<Type> argtypes, List<Type> typeargtypes) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2161
            return !site.isErroneous();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2162
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2163
        public List<Type> getArgumentTypes(ResolveError errSym, Symbol accessedSym, Name name, List<Type> argtypes) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2164
            return argtypes;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2165
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2166
    };
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2167
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2168
    LogResolveHelper methodLogResolveHelper = new LogResolveHelper() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2169
        public boolean resolveDiagnosticNeeded(Type site, List<Type> argtypes, List<Type> typeargtypes) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2170
            return !site.isErroneous() &&
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2171
                        !Type.isErroneous(argtypes) &&
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2172
                        (typeargtypes == null || !Type.isErroneous(typeargtypes));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2173
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2174
        public List<Type> getArgumentTypes(ResolveError errSym, Symbol accessedSym, Name name, List<Type> argtypes) {
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2175
            return (syms.operatorNames.contains(name)) ?
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2176
                    argtypes :
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2177
                    Type.map(argtypes, new ResolveDeferredRecoveryMap(accessedSym));
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2178
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2179
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2180
        class ResolveDeferredRecoveryMap extends DeferredAttr.RecoveryDeferredTypeMap {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2181
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2182
            public ResolveDeferredRecoveryMap(Symbol msym) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2183
                deferredAttr.super(AttrMode.SPECULATIVE, msym, currentResolutionContext.step);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2184
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2185
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2186
            @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2187
            protected Type typeOf(DeferredType dt) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2188
                Type res = super.typeOf(dt);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2189
                if (!res.isErroneous()) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2190
                    switch (TreeInfo.skipParens(dt.tree).getTag()) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2191
                        case LAMBDA:
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2192
                        case REFERENCE:
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2193
                            return dt;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2194
                        case CONDEXPR:
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2195
                            return res == Type.recoveryType ?
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2196
                                    dt : res;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2197
                    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2198
                }
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2199
                return res;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2200
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2201
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2202
    };
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2203
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2204
    /** Check that sym is not an abstract method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2205
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2206
    void checkNonAbstract(DiagnosticPosition pos, Symbol sym) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  2207
        if ((sym.flags() & ABSTRACT) != 0 && (sym.flags() & DEFAULT) == 0)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2208
            log.error(pos, "abstract.cant.be.accessed.directly",
06bc494ca11e Initial load
duke
parents:
diff changeset
  2209
                      kindName(sym), sym, sym.location());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2210
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2211
06bc494ca11e Initial load
duke
parents:
diff changeset
  2212
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2213
 *  Debugging
06bc494ca11e Initial load
duke
parents:
diff changeset
  2214
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2215
06bc494ca11e Initial load
duke
parents:
diff changeset
  2216
    /** print all scopes starting with scope s and proceeding outwards.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2217
     *  used for debugging.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2218
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2219
    public void printscopes(Scope s) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2220
        while (s != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2221
            if (s.owner != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2222
                System.err.print(s.owner + ": ");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2223
            for (Scope.Entry e = s.elems; e != null; e = e.sibling) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2224
                if ((e.sym.flags() & ABSTRACT) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2225
                    System.err.print("abstract ");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2226
                System.err.print(e.sym + " ");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2227
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2228
            System.err.println();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2229
            s = s.next;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2230
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2231
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2232
06bc494ca11e Initial load
duke
parents:
diff changeset
  2233
    void printscopes(Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2234
        while (env.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2235
            System.err.println("------------------------------");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2236
            printscopes(env.info.scope);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2237
            env = env.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2238
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2239
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2240
06bc494ca11e Initial load
duke
parents:
diff changeset
  2241
    public void printscopes(Type t) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  2242
        while (t.hasTag(CLASS)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2243
            printscopes(t.tsym.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2244
            t = types.supertype(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2245
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2246
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2247
06bc494ca11e Initial load
duke
parents:
diff changeset
  2248
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2249
 *  Name resolution
06bc494ca11e Initial load
duke
parents:
diff changeset
  2250
 *  Naming conventions are as for symbol lookup
06bc494ca11e Initial load
duke
parents:
diff changeset
  2251
 *  Unlike the find... methods these methods will report access errors
06bc494ca11e Initial load
duke
parents:
diff changeset
  2252
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2253
06bc494ca11e Initial load
duke
parents:
diff changeset
  2254
    /** Resolve an unqualified (non-method) identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2255
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2256
     *  @param env       The environment current at the identifier use.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2257
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2258
     *  @param kind      The set of admissible symbol kinds for the identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2259
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2260
    Symbol resolveIdent(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2261
                        Name name, int kind) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2262
        return accessBase(
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2263
            findIdent(env, name, kind),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2264
            pos, env.enclClass.sym.type, name, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2265
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2266
06bc494ca11e Initial load
duke
parents:
diff changeset
  2267
    /** Resolve an unqualified method identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2268
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2269
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2270
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2271
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2272
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2273
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2274
    Symbol resolveMethod(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2275
                         Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2276
                         Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2277
                         List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2278
                         List<Type> typeargtypes) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2279
        return lookupMethod(env, pos, env.enclClass.sym, resolveMethodCheck,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2280
                new BasicLookupHelper(name, env.enclClass.sym.type, argtypes, typeargtypes) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2281
                    @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2282
                    Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2283
                        return findFun(env, name, argtypes, typeargtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2284
                                phase.isBoxingRequired(),
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2285
                                phase.isVarargsRequired());
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2286
                    }});
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  2287
    }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  2288
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2289
    /** Resolve a qualified method identifier
06bc494ca11e Initial load
duke
parents:
diff changeset
  2290
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2291
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2292
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  2293
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2294
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2295
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2296
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2297
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2298
    Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2299
                                  Type site, Name name, List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2300
                                  List<Type> typeargtypes) {
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2301
        return resolveQualifiedMethod(pos, env, site.tsym, site, name, argtypes, typeargtypes);
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2302
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2303
    Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2304
                                  Symbol location, Type site, Name name, List<Type> argtypes,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2305
                                  List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2306
        return resolveQualifiedMethod(new MethodResolutionContext(), pos, env, location, site, name, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2307
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2308
    private Symbol resolveQualifiedMethod(MethodResolutionContext resolveContext,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2309
                                  DiagnosticPosition pos, Env<AttrContext> env,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2310
                                  Symbol location, Type site, Name name, List<Type> argtypes,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2311
                                  List<Type> typeargtypes) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2312
        return lookupMethod(env, pos, location, resolveContext, new BasicLookupHelper(name, site, argtypes, typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2313
            @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2314
            Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2315
                return findMethod(env, site, name, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2316
                        phase.isBoxingRequired(),
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2317
                        phase.isVarargsRequired(), false);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2318
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2319
            @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2320
            Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2321
                if (sym.kind >= AMBIGUOUS) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2322
                    sym = super.access(env, pos, location, sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2323
                } else if (allowMethodHandles) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2324
                    MethodSymbol msym = (MethodSymbol)sym;
18389
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18378
diff changeset
  2325
                    if ((msym.flags() & SIGNATURE_POLYMORPHIC) != 0) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2326
                        return findPolymorphicSignatureInstance(env, sym, argtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2327
                    }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2328
                }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2329
                return sym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2330
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2331
        });
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2332
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2333
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2334
    /** Find or create an implicit method of exactly the given type (after erasure).
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2335
     *  Searches in a side table, not the main scope of the site.
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2336
     *  This emulates the lookup process required by JSR 292 in JVM.
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2337
     *  @param env       Attribution environment
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2338
     *  @param spMethod  signature polymorphic method - i.e. MH.invokeExact
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2339
     *  @param argtypes  The required argument types
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2340
     */
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2341
    Symbol findPolymorphicSignatureInstance(Env<AttrContext> env,
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2342
                                            final Symbol spMethod,
8036
17b976649c61 6992698: JSR 292: remove support for transient syntax in polymorphic signature calls
mcimadamore
parents: 8032
diff changeset
  2343
                                            List<Type> argtypes) {
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2344
        Type mtype = infer.instantiatePolymorphicSignatureInstance(env,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2345
                (MethodSymbol)spMethod, currentResolutionContext, argtypes);
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2346
        for (Symbol sym : polymorphicSignatureScope.getElementsByName(spMethod.name)) {
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2347
            if (types.isSameType(mtype, sym.type)) {
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2348
               return sym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2349
            }
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2350
        }
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2351
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2352
        // create the desired method
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2353
        long flags = ABSTRACT | HYPOTHETICAL | spMethod.flags() & Flags.AccessFlags;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2354
        Symbol msym = new MethodSymbol(flags, spMethod.name, mtype, spMethod.owner) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2355
            @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2356
            public Symbol baseSymbol() {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2357
                return spMethod;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2358
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2359
        };
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2360
        polymorphicSignatureScope.enter(msym);
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2361
        return msym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2362
    }
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2363
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2364
    /** Resolve a qualified method identifier, throw a fatal error if not
06bc494ca11e Initial load
duke
parents:
diff changeset
  2365
     *  found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2366
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2367
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2368
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  2369
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2370
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2371
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2372
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2373
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2374
    public MethodSymbol resolveInternalMethod(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2375
                                        Type site, Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2376
                                        List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2377
                                        List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2378
        MethodResolutionContext resolveContext = new MethodResolutionContext();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2379
        resolveContext.internalResolution = true;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2380
        Symbol sym = resolveQualifiedMethod(resolveContext, pos, env, site.tsym,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2381
                site, name, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2382
        if (sym.kind == MTH) return (MethodSymbol)sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2383
        else throw new FatalError(
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2384
                 diags.fragment("fatal.err.cant.locate.meth",
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2385
                                name));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2386
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2387
06bc494ca11e Initial load
duke
parents:
diff changeset
  2388
    /** Resolve constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2389
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2390
     *  @param env       The environment current at the constructor invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2391
     *  @param site      The type of class for which a constructor is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2392
     *  @param argtypes  The types of the constructor invocation's value
06bc494ca11e Initial load
duke
parents:
diff changeset
  2393
     *                   arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2394
     *  @param typeargtypes  The types of the constructor invocation's type
06bc494ca11e Initial load
duke
parents:
diff changeset
  2395
     *                   arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2396
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2397
    Symbol resolveConstructor(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2398
                              Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2399
                              Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2400
                              List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2401
                              List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2402
        return resolveConstructor(new MethodResolutionContext(), pos, env, site, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2403
    }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2404
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2405
    private Symbol resolveConstructor(MethodResolutionContext resolveContext,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2406
                              final DiagnosticPosition pos,
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2407
                              Env<AttrContext> env,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2408
                              Type site,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2409
                              List<Type> argtypes,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2410
                              List<Type> typeargtypes) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2411
        return lookupMethod(env, pos, site.tsym, resolveContext, new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2412
            @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2413
            Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2414
                return findConstructor(pos, env, site, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2415
                        phase.isBoxingRequired(),
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2416
                        phase.isVarargsRequired());
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2417
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2418
        });
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2419
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2420
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2421
    /** Resolve a constructor, throw a fatal error if not found.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2422
     *  @param pos       The position to use for error reporting.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2423
     *  @param env       The environment current at the method invocation.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2424
     *  @param site      The type to be constructed.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2425
     *  @param argtypes  The types of the invocation's value arguments.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2426
     *  @param typeargtypes  The types of the invocation's type arguments.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2427
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2428
    public MethodSymbol resolveInternalConstructor(DiagnosticPosition pos, Env<AttrContext> env,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2429
                                        Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2430
                                        List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2431
                                        List<Type> typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2432
        MethodResolutionContext resolveContext = new MethodResolutionContext();
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2433
        resolveContext.internalResolution = true;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2434
        Symbol sym = resolveConstructor(resolveContext, pos, env, site, argtypes, typeargtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2435
        if (sym.kind == MTH) return (MethodSymbol)sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2436
        else throw new FatalError(
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2437
                 diags.fragment("fatal.err.cant.locate.ctor", site));
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2438
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2439
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2440
    Symbol findConstructor(DiagnosticPosition pos, Env<AttrContext> env,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2441
                              Type site, List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2442
                              List<Type> typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2443
                              boolean allowBoxing,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2444
                              boolean useVarargs) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2445
        Symbol sym = findMethod(env, site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2446
                                    names.init, argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2447
                                    typeargtypes, allowBoxing,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2448
                                    useVarargs, false);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2449
        chk.checkDeprecated(pos, env.info.scope.owner, sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2450
        return sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2451
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2452
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2453
    /** Resolve constructor using diamond inference.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2454
     *  @param pos       The position to use for error reporting.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2455
     *  @param env       The environment current at the constructor invocation.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2456
     *  @param site      The type of class for which a constructor is searched.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2457
     *                   The scope of this class has been touched in attribution.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2458
     *  @param argtypes  The types of the constructor invocation's value
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2459
     *                   arguments.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2460
     *  @param typeargtypes  The types of the constructor invocation's type
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2461
     *                   arguments.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2462
     */
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2463
    Symbol resolveDiamond(DiagnosticPosition pos,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2464
                              Env<AttrContext> env,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2465
                              Type site,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2466
                              List<Type> argtypes,
6344
f190fb7fdd2d 6975275: diamond implementation needs some cleanup
mcimadamore
parents: 6151
diff changeset
  2467
                              List<Type> typeargtypes) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2468
        return lookupMethod(env, pos, site.tsym, resolveMethodCheck,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2469
                new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2470
                    @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2471
                    Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2472
                        return findDiamond(env, site, argtypes, typeargtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2473
                                phase.isBoxingRequired(),
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2474
                                phase.isVarargsRequired());
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2475
                    }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2476
                    @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2477
                    Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2478
                        if (sym.kind >= AMBIGUOUS) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2479
                            final JCDiagnostic details = sym.kind == WRONG_MTH ?
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2480
                                            ((InapplicableSymbolError)sym).errCandidate().details :
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2481
                                            null;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2482
                            sym = new InapplicableSymbolError(sym.kind, "diamondError", currentResolutionContext) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2483
                                @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2484
                                JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2485
                                        Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2486
                                    String key = details == null ?
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2487
                                        "cant.apply.diamond" :
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2488
                                        "cant.apply.diamond.1";
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2489
                                    return diags.create(dkind, log.currentSource(), pos, key,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2490
                                            diags.fragment("diamond", site.tsym), details);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2491
                                }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2492
                            };
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2493
                            sym = accessMethod(sym, pos, site, names.init, true, argtypes, typeargtypes);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2494
                            env.info.pendingResolutionPhase = currentResolutionContext.step;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2495
                        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2496
                        return sym;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2497
                    }});
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2498
    }
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2499
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2500
    /** This method scans all the constructor symbol in a given class scope -
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2501
     *  assuming that the original scope contains a constructor of the kind:
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13438
diff changeset
  2502
     *  {@code Foo(X x, Y y)}, where X,Y are class type-variables declared in Foo,
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2503
     *  a method check is executed against the modified constructor type:
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13438
diff changeset
  2504
     *  {@code <X,Y>Foo<X,Y>(X x, Y y)}. This is crucial in order to enable diamond
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2505
     *  inference. The inferred return type of the synthetic constructor IS
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2506
     *  the inferred type for the diamond operator.
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2507
     */
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2508
    private Symbol findDiamond(Env<AttrContext> env,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2509
                              Type site,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2510
                              List<Type> argtypes,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2511
                              List<Type> typeargtypes,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2512
                              boolean allowBoxing,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2513
                              boolean useVarargs) {
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2514
        Symbol bestSoFar = methodNotFound;
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2515
        for (Scope.Entry e = site.tsym.members().lookup(names.init);
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2516
             e.scope != null;
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2517
             e = e.next()) {
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2518
            final Symbol sym = e.sym;
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2519
            //- System.out.println(" e " + e.sym);
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2520
            if (sym.kind == MTH &&
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2521
                (sym.flags_field & SYNTHETIC) == 0) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  2522
                    List<Type> oldParams = e.sym.type.hasTag(FORALL) ?
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2523
                            ((ForAll)sym.type).tvars :
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2524
                            List.<Type>nil();
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2525
                    Type constrType = new ForAll(site.tsym.type.getTypeArguments().appendList(oldParams),
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2526
                            types.createMethodTypeWithReturn(sym.type.asMethodType(), site));
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2527
                    MethodSymbol newConstr = new MethodSymbol(sym.flags(), names.init, constrType, site.tsym) {
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2528
                        @Override
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2529
                        public Symbol baseSymbol() {
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2530
                            return sym;
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2531
                        }
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2532
                    };
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2533
                    bestSoFar = selectBest(env, site, argtypes, typeargtypes,
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2534
                            newConstr,
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2535
                            bestSoFar,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2536
                            allowBoxing,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2537
                            useVarargs,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2538
                            false);
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2539
            }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2540
        }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2541
        return bestSoFar;
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2542
    }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2543
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2544
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2545
06bc494ca11e Initial load
duke
parents:
diff changeset
  2546
    /** Resolve operator.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2547
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2548
     *  @param optag     The tag of the operation tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2549
     *  @param env       The environment current at the operation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2550
     *  @param argtypes  The types of the operands.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2551
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
  2552
    Symbol resolveOperator(DiagnosticPosition pos, JCTree.Tag optag,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2553
                           Env<AttrContext> env, List<Type> argtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2554
        MethodResolutionContext prevResolutionContext = currentResolutionContext;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2555
        try {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2556
            currentResolutionContext = new MethodResolutionContext();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2557
            Name name = treeinfo.operatorName(optag);
17804
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2558
            return lookupMethod(env, pos, syms.predefClass, currentResolutionContext,
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2559
                    new BasicLookupHelper(name, syms.predefClass.type, argtypes, null, BOX) {
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2560
                @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2561
                Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
17804
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2562
                    return findMethod(env, site, name, argtypes, typeargtypes,
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2563
                            phase.isBoxingRequired(),
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2564
                            phase.isVarargsRequired(), true);
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2565
                }
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2566
                @Override
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2567
                Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2568
                    return accessMethod(sym, pos, env.enclClass.sym.type, name,
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2569
                          false, argtypes, null);
17804
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2570
                }
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2571
            });
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2572
        } finally {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2573
            currentResolutionContext = prevResolutionContext;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2574
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2575
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2576
06bc494ca11e Initial load
duke
parents:
diff changeset
  2577
    /** Resolve operator.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2578
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2579
     *  @param optag     The tag of the operation tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2580
     *  @param env       The environment current at the operation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2581
     *  @param arg       The type of the operand.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2582
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
  2583
    Symbol resolveUnaryOperator(DiagnosticPosition pos, JCTree.Tag optag, Env<AttrContext> env, Type arg) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2584
        return resolveOperator(pos, optag, env, List.of(arg));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2585
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2586
06bc494ca11e Initial load
duke
parents:
diff changeset
  2587
    /** Resolve binary operator.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2588
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2589
     *  @param optag     The tag of the operation tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2590
     *  @param env       The environment current at the operation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2591
     *  @param left      The types of the left operand.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2592
     *  @param right     The types of the right operand.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2593
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2594
    Symbol resolveBinaryOperator(DiagnosticPosition pos,
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
  2595
                                 JCTree.Tag optag,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2596
                                 Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2597
                                 Type left,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2598
                                 Type right) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2599
        return resolveOperator(pos, optag, env, List.of(left, right));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2600
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2601
06bc494ca11e Initial load
duke
parents:
diff changeset
  2602
    /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2603
     * Resolution of member references is typically done as a single
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2604
     * overload resolution step, where the argument types A are inferred from
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2605
     * the target functional descriptor.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2606
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2607
     * If the member reference is a method reference with a type qualifier,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2608
     * a two-step lookup process is performed. The first step uses the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2609
     * expected argument list A, while the second step discards the first
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2610
     * type from A (which is treated as a receiver type).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2611
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2612
     * There are two cases in which inference is performed: (i) if the member
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2613
     * reference is a constructor reference and the qualifier type is raw - in
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2614
     * which case diamond inference is used to infer a parameterization for the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2615
     * type qualifier; (ii) if the member reference is an unbound reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2616
     * where the type qualifier is raw - in that case, during the unbound lookup
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2617
     * the receiver argument type is used to infer an instantiation for the raw
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2618
     * qualifier type.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2619
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2620
     * When a multi-step resolution process is exploited, it is an error
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2621
     * if two candidates are found (ambiguity).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2622
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2623
     * This routine returns a pair (T,S), where S is the member reference symbol,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2624
     * and T is the type of the class in which S is defined. This is necessary as
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2625
     * the type T might be dynamically inferred (i.e. if constructor reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2626
     * has a raw qualifier).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2627
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2628
    Pair<Symbol, ReferenceLookupHelper> resolveMemberReference(DiagnosticPosition pos,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2629
                                  Env<AttrContext> env,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2630
                                  JCMemberReference referenceTree,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2631
                                  Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2632
                                  Name name, List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2633
                                  List<Type> typeargtypes,
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2634
                                  boolean boxingAllowed,
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2635
                                  MethodCheck methodCheck,
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2636
                                  InferenceContext inferenceContext) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2637
        MethodResolutionPhase maxPhase = boxingAllowed ? VARARITY : BASIC;
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2638
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2639
        ReferenceLookupHelper boundLookupHelper;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2640
        if (!name.equals(names.init)) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2641
            //method reference
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2642
            boundLookupHelper =
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2643
                    new MethodReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2644
        } else if (site.hasTag(ARRAY)) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2645
            //array constructor reference
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2646
            boundLookupHelper =
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2647
                    new ArrayConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2648
        } else {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2649
            //class constructor reference
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2650
            boundLookupHelper =
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2651
                    new ConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2652
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2653
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2654
        //step 1 - bound lookup
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2655
        Env<AttrContext> boundEnv = env.dup(env.tree, env.info.dup());
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2656
        Symbol boundSym = lookupMethod(boundEnv, env.tree.pos(), site.tsym, methodCheck, boundLookupHelper);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2657
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2658
        //step 2 - unbound lookup
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2659
        ReferenceLookupHelper unboundLookupHelper = boundLookupHelper.unboundLookup(inferenceContext);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2660
        Env<AttrContext> unboundEnv = env.dup(env.tree, env.info.dup());
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2661
        Symbol unboundSym = lookupMethod(unboundEnv, env.tree.pos(), site.tsym, methodCheck, unboundLookupHelper);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2662
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2663
        //merge results
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2664
        Pair<Symbol, ReferenceLookupHelper> res;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2665
        if (!lookupSuccess(unboundSym)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2666
            res = new Pair<Symbol, ReferenceLookupHelper>(boundSym, boundLookupHelper);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2667
            env.info.pendingResolutionPhase = boundEnv.info.pendingResolutionPhase;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2668
        } else if (lookupSuccess(boundSym)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2669
            res = new Pair<Symbol, ReferenceLookupHelper>(ambiguityError(boundSym, unboundSym), boundLookupHelper);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2670
            env.info.pendingResolutionPhase = boundEnv.info.pendingResolutionPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2671
        } else {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2672
            res = new Pair<Symbol, ReferenceLookupHelper>(unboundSym, unboundLookupHelper);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2673
            env.info.pendingResolutionPhase = unboundEnv.info.pendingResolutionPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2674
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2675
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2676
        return res;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2677
    }
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2678
    //private
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2679
        boolean lookupSuccess(Symbol s) {
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2680
            return s.kind == MTH || s.kind == AMBIGUOUS;
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2681
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2682
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2683
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2684
     * Helper for defining custom method-like lookup logic; a lookup helper
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2685
     * provides hooks for (i) the actual lookup logic and (ii) accessing the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2686
     * lookup result (this step might result in compiler diagnostics to be generated)
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2687
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2688
    abstract class LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2689
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2690
        /** name of the symbol to lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2691
        Name name;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2692
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2693
        /** location in which the lookup takes place */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2694
        Type site;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2695
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2696
        /** actual types used during the lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2697
        List<Type> argtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2698
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2699
        /** type arguments used during the lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2700
        List<Type> typeargtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2701
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2702
        /** Max overload resolution phase handled by this helper */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2703
        MethodResolutionPhase maxPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2704
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2705
        LookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2706
            this.name = name;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2707
            this.site = site;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2708
            this.argtypes = argtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2709
            this.typeargtypes = typeargtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2710
            this.maxPhase = maxPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2711
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2712
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2713
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2714
         * Should lookup stop at given phase with given result
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2715
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2716
        protected boolean shouldStop(Symbol sym, MethodResolutionPhase phase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2717
            return phase.ordinal() > maxPhase.ordinal() ||
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2718
                    sym.kind < ERRONEOUS || sym.kind == AMBIGUOUS;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2719
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2720
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2721
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2722
         * Search for a symbol under a given overload resolution phase - this method
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2723
         * is usually called several times, once per each overload resolution phase
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2724
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2725
        abstract Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2726
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2727
        /**
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2728
         * Dump overload resolution info
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2729
         */
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2730
        void debug(DiagnosticPosition pos, Symbol sym) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2731
            //do nothing
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2732
        }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2733
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2734
        /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2735
         * Validate the result of the lookup
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2736
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2737
        abstract Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2738
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2739
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2740
    abstract class BasicLookupHelper extends LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2741
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2742
        BasicLookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes) {
17804
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2743
            this(name, site, argtypes, typeargtypes, MethodResolutionPhase.VARARITY);
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2744
        }
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2745
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2746
        BasicLookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2747
            super(name, site, argtypes, typeargtypes, maxPhase);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2748
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2749
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2750
        @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2751
        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2752
            Symbol sym = doLookup(env, phase);
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2753
            if (sym.kind == AMBIGUOUS) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2754
                AmbiguityError a_err = (AmbiguityError)sym;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2755
                sym = a_err.mergeAbstracts(site);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2756
            }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2757
            return sym;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2758
        }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2759
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2760
        abstract Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2761
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2762
        @Override
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2763
        Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2764
            if (sym.kind >= AMBIGUOUS) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2765
                //if nothing is found return the 'first' error
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2766
                sym = accessMethod(sym, pos, location, site, name, true, argtypes, typeargtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2767
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2768
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2769
        }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2770
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2771
        @Override
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2772
        void debug(DiagnosticPosition pos, Symbol sym) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2773
            reportVerboseResolutionDiagnostic(pos, name, site, argtypes, typeargtypes, sym);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2774
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2775
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2776
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2777
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2778
     * Helper class for member reference lookup. A reference lookup helper
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2779
     * defines the basic logic for member reference lookup; a method gives
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2780
     * access to an 'unbound' helper used to perform an unbound member
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2781
     * reference lookup.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2782
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2783
    abstract class ReferenceLookupHelper extends LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2784
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2785
        /** The member reference tree */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2786
        JCMemberReference referenceTree;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2787
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2788
        ReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2789
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2790
            super(name, site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2791
            this.referenceTree = referenceTree;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2792
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2793
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2794
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2795
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2796
         * Returns an unbound version of this lookup helper. By default, this
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2797
         * method returns an dummy lookup helper.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2798
         */
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2799
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2800
            //dummy loopkup helper that always return 'methodNotFound'
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2801
            return new ReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2802
                @Override
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2803
                ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2804
                    return this;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2805
                }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2806
                @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2807
                Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2808
                    return methodNotFound;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2809
                }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2810
                @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2811
                ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2812
                    Assert.error();
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2813
                    return null;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2814
                }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2815
            };
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2816
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2817
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2818
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2819
         * Get the kind of the member reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2820
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2821
        abstract JCMemberReference.ReferenceKind referenceKind(Symbol sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2822
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2823
        Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2824
            if (sym.kind == AMBIGUOUS) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2825
                AmbiguityError a_err = (AmbiguityError)sym;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2826
                sym = a_err.mergeAbstracts(site);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2827
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2828
            //skip error reporting
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2829
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2830
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2831
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2832
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2833
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2834
     * Helper class for method reference lookup. The lookup logic is based
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2835
     * upon Resolve.findMethod; in certain cases, this helper class has a
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2836
     * corresponding unbound helper class (see UnboundMethodReferenceLookupHelper).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2837
     * In such cases, non-static lookup results are thrown away.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2838
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2839
    class MethodReferenceLookupHelper extends ReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2840
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2841
        MethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2842
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2843
            super(referenceTree, name, site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2844
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2845
16323
c4409c235642 8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents: 16322
diff changeset
  2846
        @Override
c4409c235642 8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents: 16322
diff changeset
  2847
        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2848
            return findMethod(env, site, name, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2849
                    phase.isBoxingRequired(), phase.isVarargsRequired(), syms.operatorNames.contains(name));
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2850
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2851
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2852
        @Override
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2853
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2854
            if (TreeInfo.isStaticSelector(referenceTree.expr, names) &&
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2855
                    argtypes.nonEmpty() &&
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2856
                    (argtypes.head.hasTag(NONE) ||
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2857
                    types.isSubtypeUnchecked(inferenceContext.asFree(argtypes.head), site))) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2858
                return new UnboundMethodReferenceLookupHelper(referenceTree, name,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2859
                        site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2860
            } else {
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2861
                return super.unboundLookup(inferenceContext);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2862
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2863
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2864
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2865
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2866
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2867
            if (sym.isStatic()) {
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14547
diff changeset
  2868
                return ReferenceKind.STATIC;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2869
            } else {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2870
                Name selName = TreeInfo.name(referenceTree.getQualifierExpression());
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2871
                return selName != null && selName == names._super ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2872
                        ReferenceKind.SUPER :
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2873
                        ReferenceKind.BOUND;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2874
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2875
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2876
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2877
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2878
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2879
     * Helper class for unbound method reference lookup. Essentially the same
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2880
     * as the basic method reference lookup helper; main difference is that static
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2881
     * lookup results are thrown away. If qualifier type is raw, an attempt to
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2882
     * infer a parameterized type is made using the first actual argument (that
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2883
     * would otherwise be ignored during the lookup).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2884
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2885
    class UnboundMethodReferenceLookupHelper extends MethodReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2886
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2887
        UnboundMethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2888
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2889
            super(referenceTree, name, site, argtypes.tail, typeargtypes, maxPhase);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2890
            if (site.isRaw() && !argtypes.head.hasTag(NONE)) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2891
                Type asSuperSite = types.asSuper(argtypes.head, site.tsym);
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2892
                this.site = asSuperSite;
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2893
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2894
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2895
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2896
        @Override
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2897
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2898
            return this;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2899
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2900
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2901
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2902
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2903
            return ReferenceKind.UNBOUND;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2904
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2905
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2906
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2907
    /**
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2908
     * Helper class for array constructor lookup; an array constructor lookup
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2909
     * is simulated by looking up a method that returns the array type specified
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2910
     * as qualifier, and that accepts a single int parameter (size of the array).
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2911
     */
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2912
    class ArrayConstructorReferenceLookupHelper extends ReferenceLookupHelper {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2913
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2914
        ArrayConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes,
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2915
                List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2916
            super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2917
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2918
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2919
        @Override
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2920
        protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2921
            Scope sc = new Scope(syms.arrayClass);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2922
            MethodSymbol arrayConstr = new MethodSymbol(PUBLIC, name, null, site.tsym);
18646
e628560a86d1 8017104: javac should have a class for primitive types that inherits from Type
vromero
parents: 18389
diff changeset
  2923
            arrayConstr.type = new MethodType(List.<Type>of(syms.intType), site, List.<Type>nil(), syms.methodClass);
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2924
            sc.enter(arrayConstr);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2925
            return findMethodInScope(env, site, name, argtypes, typeargtypes, sc, methodNotFound, phase.isBoxingRequired(), phase.isVarargsRequired(), false, false);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2926
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2927
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2928
        @Override
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2929
        ReferenceKind referenceKind(Symbol sym) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2930
            return ReferenceKind.ARRAY_CTOR;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2931
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2932
    }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2933
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2934
    /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2935
     * Helper class for constructor reference lookup. The lookup logic is based
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2936
     * upon either Resolve.findMethod or Resolve.findDiamond - depending on
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2937
     * whether the constructor reference needs diamond inference (this is the case
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2938
     * if the qualifier type is raw). A special erroneous symbol is returned
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2939
     * if the lookup returns the constructor of an inner class and there's no
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2940
     * enclosing instance in scope.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2941
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2942
    class ConstructorReferenceLookupHelper extends ReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2943
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2944
        boolean needsInference;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2945
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2946
        ConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2947
                List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2948
            super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2949
            if (site.isRaw()) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2950
                this.site = new ClassType(site.getEnclosingType(), site.tsym.type.getTypeArguments(), site.tsym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2951
                needsInference = true;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2952
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2953
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2954
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2955
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2956
        protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2957
            Symbol sym = needsInference ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2958
                findDiamond(env, site, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) :
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2959
                findMethod(env, site, name, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2960
                        phase.isBoxingRequired(), phase.isVarargsRequired(), syms.operatorNames.contains(name));
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2961
            return sym.kind != MTH ||
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2962
                          site.getEnclosingType().hasTag(NONE) ||
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2963
                          hasEnclosingInstance(env, site) ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2964
                          sym : new InvalidSymbolError(Kinds.MISSING_ENCL, sym, null) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2965
                    @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2966
                    JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2967
                       return diags.create(dkind, log.currentSource(), pos,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2968
                            "cant.access.inner.cls.constr", site.tsym.name, argtypes, site.getEnclosingType());
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2969
                    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2970
                };
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2971
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2972
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2973
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2974
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2975
            return site.getEnclosingType().hasTag(NONE) ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2976
                    ReferenceKind.TOPLEVEL : ReferenceKind.IMPLICIT_INNER;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2977
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2978
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2979
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2980
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2981
     * Main overload resolution routine. On each overload resolution step, a
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2982
     * lookup helper class is used to perform the method/constructor lookup;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2983
     * at the end of the lookup, the helper is used to validate the results
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2984
     * (this last step might trigger overload resolution diagnostics).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2985
     */
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2986
    Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, MethodCheck methodCheck, LookupHelper lookupHelper) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2987
        MethodResolutionContext resolveContext = new MethodResolutionContext();
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2988
        resolveContext.methodCheck = methodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2989
        return lookupMethod(env, pos, location, resolveContext, lookupHelper);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2990
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2991
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2992
    Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2993
            MethodResolutionContext resolveContext, LookupHelper lookupHelper) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2994
        MethodResolutionContext prevResolutionContext = currentResolutionContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2995
        try {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2996
            Symbol bestSoFar = methodNotFound;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2997
            currentResolutionContext = resolveContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2998
            for (MethodResolutionPhase phase : methodResolutionSteps) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2999
                if (!phase.isApplicable(boxingEnabled, varargsEnabled) ||
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3000
                        lookupHelper.shouldStop(bestSoFar, phase)) break;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3001
                MethodResolutionPhase prevPhase = currentResolutionContext.step;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3002
                Symbol prevBest = bestSoFar;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3003
                currentResolutionContext.step = phase;
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3004
                Symbol sym = lookupHelper.lookup(env, phase);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3005
                lookupHelper.debug(pos, sym);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3006
                bestSoFar = phase.mergeResults(bestSoFar, sym);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3007
                env.info.pendingResolutionPhase = (prevBest == bestSoFar) ? prevPhase : phase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3008
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3009
            return lookupHelper.access(env, pos, location, bestSoFar);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3010
        } finally {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3011
            currentResolutionContext = prevResolutionContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3012
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3013
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3014
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3015
    /**
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3016
     * Resolve `c.name' where name == this or name == super.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3017
     * @param pos           The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3018
     * @param env           The environment current at the expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3019
     * @param c             The qualifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3020
     * @param name          The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3021
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3022
    Symbol resolveSelf(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3023
                       Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3024
                       TypeSymbol c,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3025
                       Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3026
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3027
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3028
        while (env1.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3029
            if (isStatic(env1)) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3030
            if (env1.enclClass.sym == c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3031
                Symbol sym = env1.info.scope.lookup(name).sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3032
                if (sym != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3033
                    if (staticOnly) sym = new StaticError(sym);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3034
                    return accessBase(sym, pos, env.enclClass.sym.type,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3035
                                  name, true);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3036
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3037
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3038
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3039
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3040
        }
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3041
        if (allowDefaultMethods && c.isInterface() &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3042
                name == names._super && !isStatic(env) &&
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  3043
                types.isDirectSuperInterface(c, env.enclClass.sym)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3044
            //this might be a default super call if one of the superinterfaces is 'c'
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3045
            for (Type t : pruneInterfaces(env.enclClass.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3046
                if (t.tsym == c) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3047
                    env.info.defaultSuperCallSite = t;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3048
                    return new VarSymbol(0, names._super,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3049
                            types.asSuper(env.enclClass.type, c), env.enclClass.sym);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3050
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3051
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3052
            //find a direct superinterface that is a subtype of 'c'
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3053
            for (Type i : types.interfaces(env.enclClass.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3054
                if (i.tsym.isSubClass(c, types) && i.tsym != c) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3055
                    log.error(pos, "illegal.default.super.call", c,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3056
                            diags.fragment("redundant.supertype", c, i));
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3057
                    return syms.errSymbol;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3058
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3059
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3060
            Assert.error();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3061
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3062
        log.error(pos, "not.encl.class", c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3063
        return syms.errSymbol;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3064
    }
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3065
    //where
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3066
    private List<Type> pruneInterfaces(Type t) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3067
        ListBuffer<Type> result = ListBuffer.lb();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3068
        for (Type t1 : types.interfaces(t)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3069
            boolean shouldAdd = true;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3070
            for (Type t2 : types.interfaces(t)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3071
                if (t1 != t2 && types.isSubtypeNoCapture(t2, t1)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3072
                    shouldAdd = false;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3073
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3074
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3075
            if (shouldAdd) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3076
                result.append(t1);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3077
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3078
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3079
        return result.toList();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3080
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3081
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3082
06bc494ca11e Initial load
duke
parents:
diff changeset
  3083
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  3084
     * Resolve `c.this' for an enclosing class c that contains the
06bc494ca11e Initial load
duke
parents:
diff changeset
  3085
     * named member.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3086
     * @param pos           The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3087
     * @param env           The environment current at the expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3088
     * @param member        The member that must be contained in the result.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3089
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3090
    Symbol resolveSelfContaining(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3091
                                 Env<AttrContext> env,
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3092
                                 Symbol member,
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3093
                                 boolean isSuperCall) {
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3094
        Symbol sym = resolveSelfContainingInternal(env, member, isSuperCall);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3095
        if (sym == null) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3096
            log.error(pos, "encl.class.required", member);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3097
            return syms.errSymbol;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3098
        } else {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3099
            return accessBase(sym, pos, env.enclClass.sym.type, sym.name, true);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3100
        }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3101
    }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3102
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3103
    boolean hasEnclosingInstance(Env<AttrContext> env, Type type) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3104
        Symbol encl = resolveSelfContainingInternal(env, type.tsym, false);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3105
        return encl != null && encl.kind < ERRONEOUS;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3106
    }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3107
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3108
    private Symbol resolveSelfContainingInternal(Env<AttrContext> env,
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3109
                                 Symbol member,
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3110
                                 boolean isSuperCall) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3111
        Name name = names._this;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3112
        Env<AttrContext> env1 = isSuperCall ? env.outer : env;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3113
        boolean staticOnly = false;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3114
        if (env1 != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3115
            while (env1 != null && env1.outer != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3116
                if (isStatic(env1)) staticOnly = true;
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3117
                if (env1.enclClass.sym.isSubClass(member.owner, types)) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3118
                    Symbol sym = env1.info.scope.lookup(name).sym;
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3119
                    if (sym != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3120
                        if (staticOnly) sym = new StaticError(sym);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3121
                        return sym;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3122
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3123
                }
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3124
                if ((env1.enclClass.sym.flags() & STATIC) != 0)
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3125
                    staticOnly = true;
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3126
                env1 = env1.outer;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3127
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3128
        }
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3129
        return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3130
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3131
06bc494ca11e Initial load
duke
parents:
diff changeset
  3132
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  3133
     * Resolve an appropriate implicit this instance for t's container.
9303
eae35c201e19 7032975: API files in javax.annotation.processing need to be updated for references to JLS
jjh
parents: 9302
diff changeset
  3134
     * JLS 8.8.5.1 and 15.9.2
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3135
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3136
    Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t) {
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3137
        return resolveImplicitThis(pos, env, t, false);
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3138
    }
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3139
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3140
    Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t, boolean isSuperCall) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3141
        Type thisType = (((t.tsym.owner.kind & (MTH|VAR)) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3142
                         ? resolveSelf(pos, env, t.getEnclosingType().tsym, names._this)
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3143
                         : resolveSelfContaining(pos, env, t.tsym, isSuperCall)).type;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3144
        if (env.info.isSelfCall && thisType.tsym == env.enclClass.sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3145
            log.error(pos, "cant.ref.before.ctor.called", "this");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3146
        return thisType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3147
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3148
06bc494ca11e Initial load
duke
parents:
diff changeset
  3149
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  3150
 *  ResolveError classes, indicating error situations when accessing symbols
06bc494ca11e Initial load
duke
parents:
diff changeset
  3151
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  3152
12082
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3153
    //used by TransTypes when checking target type of synthetic cast
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3154
    public void logAccessErrorInternal(Env<AttrContext> env, JCTree tree, Type type) {
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3155
        AccessError error = new AccessError(env, env.enclClass.type, type.tsym);
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3156
        logResolveError(error, tree.pos(), env.enclClass.sym, env.enclClass.type, null, null, null);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3157
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3158
    //where
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3159
    private void logResolveError(ResolveError error,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3160
            DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3161
            Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3162
            Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3163
            Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3164
            List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3165
            List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3166
        JCDiagnostic d = error.getDiagnostic(JCDiagnostic.DiagnosticType.ERROR,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3167
                pos, location, site, name, argtypes, typeargtypes);
6356
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3168
        if (d != null) {
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3169
            d.setFlag(DiagnosticFlag.RESOLVE_ERROR);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3170
            log.report(d);
6356
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3171
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3172
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3173
1534
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3174
    private final LocalizedString noArgs = new LocalizedString("compiler.misc.no.args");
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3175
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3176
    public Object methodArguments(List<Type> argtypes) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3177
        if (argtypes == null || argtypes.isEmpty()) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3178
            return noArgs;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3179
        } else {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3180
            ListBuffer<Object> diagArgs = ListBuffer.lb();
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3181
            for (Type t : argtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  3182
                if (t.hasTag(DEFERRED)) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3183
                    diagArgs.append(((DeferredAttr.DeferredType)t).tree);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3184
                } else {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3185
                    diagArgs.append(t);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3186
                }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3187
            }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3188
            return diagArgs;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3189
        }
1534
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3190
    }
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3191
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3192
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3193
     * Root class for resolution errors. Subclass of ResolveError
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3194
     * represent a different kinds of resolution error - as such they must
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3195
     * specify how they map into concrete compiler diagnostics.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3196
     */
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3197
    abstract class ResolveError extends Symbol {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3198
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3199
        /** The name of the kind of error, for debugging only. */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3200
        final String debugName;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3201
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3202
        ResolveError(int kind, String debugName) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3203
            super(kind, 0, null, null, null);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3204
            this.debugName = debugName;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3205
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3206
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3207
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3208
        public <R, P> R accept(ElementVisitor<R, P> v, P p) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3209
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3210
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3211
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3212
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3213
        public String toString() {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3214
            return debugName;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3215
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3216
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3217
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3218
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3219
            return false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3220
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3221
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3222
        /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3223
         * Create an external representation for this erroneous symbol to be
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3224
         * used during attribution - by default this returns the symbol of a
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3225
         * brand new error type which stores the original type found
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3226
         * during resolution.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3227
         *
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3228
         * @param name     the name used during resolution
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3229
         * @param location the location from which the symbol is accessed
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3230
         */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3231
        protected Symbol access(Name name, TypeSymbol location) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3232
            return types.createErrorType(name, location, syms.errSymbol.type).tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3233
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3234
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3235
        /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3236
         * Create a diagnostic representing this resolution error.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3237
         *
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3238
         * @param dkind     The kind of the diagnostic to be created (e.g error).
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3239
         * @param pos       The position to be used for error reporting.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3240
         * @param site      The original type from where the selection took place.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3241
         * @param name      The name of the symbol to be resolved.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3242
         * @param argtypes  The invocation's value arguments,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3243
         *                  if we looked for a method.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3244
         * @param typeargtypes  The invocation's type arguments,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3245
         *                      if we looked for a method.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3246
         */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3247
        abstract JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3248
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3249
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3250
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3251
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3252
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3253
                List<Type> typeargtypes);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3254
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3255
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3256
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3257
     * This class is the root class of all resolution errors caused by
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3258
     * an invalid symbol being found during resolution.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3259
     */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3260
    abstract class InvalidSymbolError extends ResolveError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3261
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3262
        /** The invalid symbol found during resolution */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3263
        Symbol sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3264
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3265
        InvalidSymbolError(int kind, Symbol sym, String debugName) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3266
            super(kind, debugName);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3267
            this.sym = sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3268
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3269
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3270
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3271
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3272
            return true;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3273
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3274
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3275
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3276
        public String toString() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3277
             return super.toString() + " wrongSym=" + sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3278
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3279
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3280
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3281
        public Symbol access(Name name, TypeSymbol location) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3282
            if ((sym.kind & ERRONEOUS) == 0 && (sym.kind & TYP) != 0)
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3283
                return types.createErrorType(name, location, sym.type).tsym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3284
            else
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3285
                return sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3286
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3287
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3288
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3289
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3290
     * InvalidSymbolError error class indicating that a symbol matching a
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3291
     * given name does not exists in a given site.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3292
     */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3293
    class SymbolNotFoundError extends ResolveError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3294
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3295
        SymbolNotFoundError(int kind) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3296
            super(kind, "symbol not found error");
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3297
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3298
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3299
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3300
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3301
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3302
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3303
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3304
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3305
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3306
                List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3307
            argtypes = argtypes == null ? List.<Type>nil() : argtypes;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3308
            typeargtypes = typeargtypes == null ? List.<Type>nil() : typeargtypes;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3309
            if (name == names.error)
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3310
                return null;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3311
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3312
            if (syms.operatorNames.contains(name)) {
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3313
                boolean isUnaryOp = argtypes.size() == 1;
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3314
                String key = argtypes.size() == 1 ?
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3315
                    "operator.cant.be.applied" :
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3316
                    "operator.cant.be.applied.1";
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3317
                Type first = argtypes.head;
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3318
                Type second = !isUnaryOp ? argtypes.tail.head : null;
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3319
                return diags.create(dkind, log.currentSource(), pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3320
                        key, name, first, second);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3321
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3322
            boolean hasLocation = false;
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3323
            if (location == null) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3324
                location = site.tsym;
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3325
            }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3326
            if (!location.name.isEmpty()) {
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3327
                if (location.kind == PCK && !site.tsym.exists()) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3328
                    return diags.create(dkind, log.currentSource(), pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3329
                        "doesnt.exist", location);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3330
                }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3331
                hasLocation = !location.name.equals(names._this) &&
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3332
                        !location.name.equals(names._super);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3333
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3334
            boolean isConstructor = kind == ABSENT_MTH && name == names.init;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3335
            KindName kindname = isConstructor ? KindName.CONSTRUCTOR : absentKind(kind);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3336
            Name idname = isConstructor ? site.tsym.name : name;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3337
            String errKey = getErrorKey(kindname, typeargtypes.nonEmpty(), hasLocation);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3338
            if (hasLocation) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3339
                return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3340
                        errKey, kindname, idname, //symbol kindname, name
14953
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3341
                        typeargtypes, args(argtypes), //type parameters and arguments (if any)
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3342
                        getLocationDiag(location, site)); //location kindname, type
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3343
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3344
            else {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3345
                return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3346
                        errKey, kindname, idname, //symbol kindname, name
14953
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3347
                        typeargtypes, args(argtypes)); //type parameters and arguments (if any)
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3348
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3349
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3350
        //where
14953
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3351
        private Object args(List<Type> args) {
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3352
            return args.isEmpty() ? args : methodArguments(args);
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3353
        }
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3354
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3355
        private String getErrorKey(KindName kindname, boolean hasTypeArgs, boolean hasLocation) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3356
            String key = "cant.resolve";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3357
            String suffix = hasLocation ? ".location" : "";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3358
            switch (kindname) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3359
                case METHOD:
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3360
                case CONSTRUCTOR: {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3361
                    suffix += ".args";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3362
                    suffix += hasTypeArgs ? ".params" : "";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3363
                }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3364
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3365
            return key + suffix;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3366
        }
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3367
        private JCDiagnostic getLocationDiag(Symbol location, Type site) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3368
            if (location.kind == VAR) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3369
                return diags.fragment("location.1",
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3370
                    kindName(location),
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3371
                    location,
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3372
                    location.type);
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3373
            } else {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3374
                return diags.fragment("location",
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3375
                    typeKindName(site),
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3376
                    site,
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3377
                    null);
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3378
            }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3379
        }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3380
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3381
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3382
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3383
     * InvalidSymbolError error class indicating that a given symbol
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3384
     * (either a method, a constructor or an operand) is not applicable
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3385
     * given an actual arguments/type argument list.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3386
     */
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3387
    class InapplicableSymbolError extends ResolveError {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3388
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3389
        protected MethodResolutionContext resolveContext;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3390
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3391
        InapplicableSymbolError(MethodResolutionContext context) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3392
            this(WRONG_MTH, "inapplicable symbol error", context);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3393
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3394
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3395
        protected InapplicableSymbolError(int kind, String debugName, MethodResolutionContext context) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3396
            super(kind, debugName);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3397
            this.resolveContext = context;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3398
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3399
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3400
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3401
        public String toString() {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3402
            return super.toString();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3403
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3404
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3405
        @Override
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3406
        public boolean exists() {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3407
            return true;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3408
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3409
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3410
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3411
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3412
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3413
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3414
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3415
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3416
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3417
                List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3418
            if (name == names.error)
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3419
                return null;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3420
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3421
            if (syms.operatorNames.contains(name)) {
8237
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3422
                boolean isUnaryOp = argtypes.size() == 1;
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3423
                String key = argtypes.size() == 1 ?
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3424
                    "operator.cant.be.applied" :
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3425
                    "operator.cant.be.applied.1";
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3426
                Type first = argtypes.head;
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3427
                Type second = !isUnaryOp ? argtypes.tail.head : null;
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3428
                return diags.create(dkind, log.currentSource(), pos,
d5ef8db7ad09 5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents: 8236
diff changeset
  3429
                        key, name, first, second);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3430
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3431
            else {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3432
                Candidate c = errCandidate();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3433
                if (compactMethodDiags) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3434
                    for (Map.Entry<Template, DiagnosticRewriter> _entry :
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3435
                            MethodResolutionDiagHelper.rewriters.entrySet()) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3436
                        if (_entry.getKey().matches(c.details)) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3437
                            JCDiagnostic simpleDiag =
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3438
                                    _entry.getValue().rewriteDiagnostic(diags, pos,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3439
                                        log.currentSource(), dkind, c.details);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3440
                            simpleDiag.setFlag(DiagnosticFlag.COMPRESSED);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3441
                            return simpleDiag;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3442
                        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3443
                    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3444
                }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3445
                Symbol ws = c.sym.asMemberOf(site, types);
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3446
                return diags.create(dkind, log.currentSource(), pos,
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3447
                          "cant.apply.symbol",
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3448
                          kindName(ws),
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3449
                          ws.name == names.init ? ws.owner.name : ws.name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3450
                          methodArguments(ws.type.getParameterTypes()),
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3451
                          methodArguments(argtypes),
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3452
                          kindName(ws.owner),
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3453
                          ws.owner.type,
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3454
                          c.details);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3455
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3456
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3457
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3458
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3459
        public Symbol access(Name name, TypeSymbol location) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3460
            return types.createErrorType(name, location, syms.errSymbol.type).tsym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3461
        }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3462
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3463
        private Candidate errCandidate() {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3464
            Candidate bestSoFar = null;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3465
            for (Candidate c : resolveContext.candidates) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3466
                if (c.isApplicable()) continue;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3467
                bestSoFar = c;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3468
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3469
            Assert.checkNonNull(bestSoFar);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3470
            return bestSoFar;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3471
        }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3472
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3473
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3474
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3475
     * ResolveError error class indicating that a set of symbols
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3476
     * (either methods, constructors or operands) is not applicable
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3477
     * given an actual arguments/type argument list.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3478
     */
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3479
    class InapplicableSymbolsError extends InapplicableSymbolError {
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3480
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3481
        InapplicableSymbolsError(MethodResolutionContext context) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3482
            super(WRONG_MTHS, "inapplicable symbols", context);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3483
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3484
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3485
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3486
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3487
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3488
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3489
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3490
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3491
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3492
                List<Type> typeargtypes) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3493
            Map<Symbol, JCDiagnostic> candidatesMap = mapCandidates();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3494
            Map<Symbol, JCDiagnostic> filteredCandidates = filterCandidates(candidatesMap);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3495
            if (filteredCandidates.isEmpty()) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3496
                filteredCandidates = candidatesMap;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3497
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3498
            boolean truncatedDiag = candidatesMap.size() != filteredCandidates.size();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3499
            if (filteredCandidates.size() > 1) {
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3500
                JCDiagnostic err = diags.create(dkind,
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3501
                        null,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3502
                        truncatedDiag ?
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3503
                            EnumSet.of(DiagnosticFlag.COMPRESSED) :
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3504
                            EnumSet.noneOf(DiagnosticFlag.class),
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3505
                        log.currentSource(),
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3506
                        pos,
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3507
                        "cant.apply.symbols",
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3508
                        name == names.init ? KindName.CONSTRUCTOR : absentKind(kind),
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3509
                        name == names.init ? site.tsym.name : name,
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  3510
                        methodArguments(argtypes));
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3511
                return new JCDiagnostic.MultilineDiagnostic(err, candidateDetails(filteredCandidates, site));
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3512
            } else if (filteredCandidates.size() == 1) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3513
                JCDiagnostic d =  new InapplicableSymbolError(resolveContext).getDiagnostic(dkind, pos,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3514
                    location, site, name, argtypes, typeargtypes);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3515
                if (truncatedDiag) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3516
                    d.setFlag(DiagnosticFlag.COMPRESSED);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3517
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3518
                return d;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3519
            } else {
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3520
                return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind, pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3521
                    location, site, name, argtypes, typeargtypes);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3522
            }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3523
        }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3524
        //where
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3525
            private Map<Symbol, JCDiagnostic> mapCandidates() {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3526
                Map<Symbol, JCDiagnostic> candidates = new LinkedHashMap<Symbol, JCDiagnostic>();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3527
                for (Candidate c : resolveContext.candidates) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3528
                    if (c.isApplicable()) continue;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3529
                    candidates.put(c.sym, c.details);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3530
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3531
                return candidates;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3532
            }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3533
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3534
            Map<Symbol, JCDiagnostic> filterCandidates(Map<Symbol, JCDiagnostic> candidatesMap) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3535
                Map<Symbol, JCDiagnostic> candidates = new LinkedHashMap<Symbol, JCDiagnostic>();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3536
                for (Map.Entry<Symbol, JCDiagnostic> _entry : candidatesMap.entrySet()) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3537
                    JCDiagnostic d = _entry.getValue();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3538
                    if (!compactMethodDiags ||
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3539
                            !new Template(MethodCheckDiag.ARITY_MISMATCH.regex()).matches(d)) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3540
                        candidates.put(_entry.getKey(), d);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3541
                    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3542
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3543
                return candidates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3544
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3545
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3546
            private List<JCDiagnostic> candidateDetails(Map<Symbol, JCDiagnostic> candidatesMap, Type site) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3547
                List<JCDiagnostic> details = List.nil();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3548
                for (Map.Entry<Symbol, JCDiagnostic> _entry : candidatesMap.entrySet()) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3549
                    Symbol sym = _entry.getKey();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3550
                    JCDiagnostic detailDiag = diags.fragment("inapplicable.method",
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3551
                            Kinds.kindName(sym),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3552
                            sym.location(site, types),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3553
                            sym.asMemberOf(site, types),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3554
                            _entry.getValue());
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3555
                    details = details.prepend(detailDiag);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3556
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3557
                //typically members are visited in reverse order (see Scope)
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3558
                //so we need to reverse the candidate list so that candidates
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3559
                //conform to source order
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3560
                return details;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3561
            }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3562
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3563
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3564
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3565
     * An InvalidSymbolError error class indicating that a symbol is not
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3566
     * accessible from a given site
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3567
     */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3568
    class AccessError extends InvalidSymbolError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3569
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3570
        private Env<AttrContext> env;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3571
        private Type site;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3572
06bc494ca11e Initial load
duke
parents:
diff changeset
  3573
        AccessError(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3574
            this(null, null, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3575
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3576
06bc494ca11e Initial load
duke
parents:
diff changeset
  3577
        AccessError(Env<AttrContext> env, Type site, Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3578
            super(HIDDEN, sym, "access error");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3579
            this.env = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3580
            this.site = site;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3581
            if (debugResolve)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3582
                log.error("proc.messager", sym + " @ " + site + " is inaccessible.");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3583
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3584
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3585
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3586
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3587
            return false;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3588
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3589
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3590
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3591
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3592
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3593
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3594
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3595
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3596
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3597
                List<Type> typeargtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  3598
            if (sym.owner.type.hasTag(ERROR))
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3599
                return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3600
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3601
            if (sym.name == names.init && sym.owner != site.tsym) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3602
                return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3603
                        pos, location, site, name, argtypes, typeargtypes);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3604
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3605
            else if ((sym.flags() & PUBLIC) != 0
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3606
                || (env != null && this.site != null
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3607
                    && !isAccessible(env, this.site))) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3608
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3609
                        pos, "not.def.access.class.intf.cant.access",
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3610
                    sym, sym.location());
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3611
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3612
            else if ((sym.flags() & (PRIVATE | PROTECTED)) != 0) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3613
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3614
                        pos, "report.access", sym,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3615
                        asFlagSet(sym.flags() & (PRIVATE | PROTECTED)),
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3616
                        sym.location());
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3617
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3618
            else {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3619
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3620
                        pos, "not.def.public.cant.access", sym, sym.location());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3621
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3622
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3623
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3624
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3625
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3626
     * InvalidSymbolError error class indicating that an instance member
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3627
     * has erroneously been accessed from a static context.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3628
     */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3629
    class StaticError extends InvalidSymbolError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3630
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3631
        StaticError(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3632
            super(STATICERR, sym, "static error");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3633
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3634
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3635
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3636
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3637
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3638
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3639
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3640
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3641
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3642
                List<Type> typeargtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  3643
            Symbol errSym = ((sym.kind == TYP && sym.type.hasTag(CLASS))
939
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 735
diff changeset
  3644
                ? types.erasure(sym.type).tsym
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 735
diff changeset
  3645
                : sym);
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3646
            return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3647
                    "non-static.cant.be.ref", kindName(sym), errSym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3648
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3649
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3650
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3651
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3652
     * InvalidSymbolError error class indicating that a pair of symbols
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3653
     * (either methods, constructors or operands) are ambiguous
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3654
     * given an actual arguments/type argument list.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3655
     */
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3656
    class AmbiguityError extends ResolveError {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3657
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3658
        /** The other maximally specific symbol */
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3659
        List<Symbol> ambiguousSyms = List.nil();
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3660
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3661
        @Override
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3662
        public boolean exists() {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3663
            return true;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3664
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3665
06bc494ca11e Initial load
duke
parents:
diff changeset
  3666
        AmbiguityError(Symbol sym1, Symbol sym2) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3667
            super(AMBIGUOUS, "ambiguity error");
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3668
            ambiguousSyms = flatten(sym2).appendList(flatten(sym1));
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3669
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3670
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3671
        private List<Symbol> flatten(Symbol sym) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3672
            if (sym.kind == AMBIGUOUS) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3673
                return ((AmbiguityError)sym).ambiguousSyms;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3674
            } else {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3675
                return List.of(sym);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3676
            }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3677
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3678
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3679
        AmbiguityError addAmbiguousSymbol(Symbol s) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3680
            ambiguousSyms = ambiguousSyms.prepend(s);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3681
            return this;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3682
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3683
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3684
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3685
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3686
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3687
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3688
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3689
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3690
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3691
                List<Type> typeargtypes) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3692
            List<Symbol> diagSyms = ambiguousSyms.reverse();
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3693
            Symbol s1 = diagSyms.head;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3694
            Symbol s2 = diagSyms.tail.head;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3695
            Name sname = s1.name;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3696
            if (sname == names.init) sname = s1.owner.name;
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3697
            return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3698
                      pos, "ref.ambiguous", sname,
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3699
                      kindName(s1),
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3700
                      s1,
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3701
                      s1.location(site, types),
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3702
                      kindName(s2),
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3703
                      s2,
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3704
                      s2.location(site, types));
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3705
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3706
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3707
        /**
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3708
         * If multiple applicable methods are found during overload and none of them
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3709
         * is more specific than the others, attempt to merge their signatures.
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3710
         */
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3711
        Symbol mergeAbstracts(Type site) {
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3712
            List<Symbol> ambiguousInOrder = ambiguousSyms.reverse();
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3713
            for (Symbol s : ambiguousInOrder) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3714
                Type mt = types.memberType(site, s);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3715
                boolean found = true;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3716
                List<Type> allThrown = mt.getThrownTypes();
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3717
                for (Symbol s2 : ambiguousInOrder) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3718
                    Type mt2 = types.memberType(site, s2);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3719
                    if ((s2.flags() & ABSTRACT) == 0 ||
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3720
                        !types.overrideEquivalent(mt, mt2) ||
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3721
                        !types.isSameTypes(s.erasure(types).getParameterTypes(),
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3722
                                       s2.erasure(types).getParameterTypes())) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3723
                        //ambiguity cannot be resolved
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3724
                        return this;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3725
                    }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3726
                    Type mst = mostSpecificReturnType(mt, mt2);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3727
                    if (mst == null || mst != mt) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3728
                        found = false;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3729
                        break;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3730
                    }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3731
                    allThrown = chk.intersect(allThrown, mt2.getThrownTypes());
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3732
                }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3733
                if (found) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3734
                    //all ambiguous methods were abstract and one method had
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3735
                    //most specific return type then others
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3736
                    return (allThrown == mt.getThrownTypes()) ?
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3737
                            s : new MethodSymbol(
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3738
                                s.flags(),
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3739
                                s.name,
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3740
                                types.createMethodTypeWithThrown(mt, allThrown),
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3741
                                s.owner);
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3742
                }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3743
            }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3744
            return this;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3745
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3746
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3747
        @Override
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3748
        protected Symbol access(Name name, TypeSymbol location) {
15362
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  3749
            Symbol firstAmbiguity = ambiguousSyms.last();
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  3750
            return firstAmbiguity.kind == TYP ?
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  3751
                    types.createErrorType(name, location, firstAmbiguity.type).tsym :
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  3752
                    firstAmbiguity;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3753
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3754
    }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3755
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3756
    class BadVarargsMethod extends ResolveError {
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3757
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3758
        ResolveError delegatedError;
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3759
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3760
        BadVarargsMethod(ResolveError delegatedError) {
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3761
            super(delegatedError.kind, "badVarargs");
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3762
            this.delegatedError = delegatedError;
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3763
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3764
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3765
        @Override
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  3766
        public Symbol baseSymbol() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  3767
            return delegatedError.baseSymbol();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  3768
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  3769
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  3770
        @Override
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3771
        protected Symbol access(Name name, TypeSymbol location) {
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3772
            return delegatedError.access(name, location);
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3773
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3774
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3775
        @Override
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3776
        public boolean exists() {
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3777
            return true;
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3778
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3779
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3780
        @Override
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3781
        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3782
            return delegatedError.getDiagnostic(dkind, pos, location, site, name, argtypes, typeargtypes);
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3783
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3784
    }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  3785
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3786
    /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3787
     * Helper class for method resolution diagnostic simplification.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3788
     * Certain resolution diagnostic are rewritten as simpler diagnostic
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3789
     * where the enclosing resolution diagnostic (i.e. 'inapplicable method')
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3790
     * is stripped away, as it doesn't carry additional info. The logic
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3791
     * for matching a given diagnostic is given in terms of a template
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3792
     * hierarchy: a diagnostic template can be specified programmatically,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3793
     * so that only certain diagnostics are matched. Each templete is then
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3794
     * associated with a rewriter object that carries out the task of rewtiting
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3795
     * the diagnostic to a simpler one.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3796
     */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3797
    static class MethodResolutionDiagHelper {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3798
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3799
        /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3800
         * A diagnostic rewriter transforms a method resolution diagnostic
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3801
         * into a simpler one
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3802
         */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3803
        interface DiagnosticRewriter {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3804
            JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3805
                    DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3806
                    DiagnosticType preferredKind, JCDiagnostic d);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3807
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3808
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3809
        /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3810
         * A diagnostic template is made up of two ingredients: (i) a regular
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3811
         * expression for matching a diagnostic key and (ii) a list of sub-templates
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3812
         * for matching diagnostic arguments.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3813
         */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3814
        static class Template {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3815
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3816
            /** regex used to match diag key */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3817
            String regex;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3818
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3819
            /** templates used to match diagnostic args */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3820
            Template[] subTemplates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3821
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3822
            Template(String key, Template... subTemplates) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3823
                this.regex = key;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3824
                this.subTemplates = subTemplates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3825
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3826
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3827
            /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3828
             * Returns true if the regex matches the diagnostic key and if
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3829
             * all diagnostic arguments are matches by corresponding sub-templates.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3830
             */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3831
            boolean matches(Object o) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3832
                JCDiagnostic d = (JCDiagnostic)o;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3833
                Object[] args = d.getArgs();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3834
                if (!d.getCode().matches(regex) ||
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3835
                        subTemplates.length != d.getArgs().length) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3836
                    return false;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3837
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3838
                for (int i = 0; i < args.length ; i++) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3839
                    if (!subTemplates[i].matches(args[i])) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3840
                        return false;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3841
                    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3842
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3843
                return true;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3844
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3845
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3846
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3847
        /** a dummy template that match any diagnostic argument */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3848
        static final Template skip = new Template("") {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3849
            @Override
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3850
            boolean matches(Object d) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3851
                return true;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3852
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3853
        };
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3854
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3855
        /** rewriter map used for method resolution simplification */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3856
        static final Map<Template, DiagnosticRewriter> rewriters =
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3857
                new LinkedHashMap<Template, DiagnosticRewriter>();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3858
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3859
        static {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3860
            String argMismatchRegex = MethodCheckDiag.ARG_MISMATCH.regex();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3861
            rewriters.put(new Template(argMismatchRegex, new Template("(.*)(bad.arg.types.in.lambda)", skip, skip)),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3862
                    new DiagnosticRewriter() {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3863
                @Override
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3864
                public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3865
                        DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3866
                        DiagnosticType preferredKind, JCDiagnostic d) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3867
                    return (JCDiagnostic)((JCDiagnostic)d.getArgs()[0]).getArgs()[1];
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3868
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3869
            });
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3870
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3871
            rewriters.put(new Template(argMismatchRegex, skip),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3872
                    new DiagnosticRewriter() {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3873
                @Override
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3874
                public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3875
                        DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3876
                        DiagnosticType preferredKind, JCDiagnostic d) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3877
                    JCDiagnostic cause = (JCDiagnostic)d.getArgs()[0];
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3878
                    return diags.create(preferredKind, preferredSource, d.getDiagnosticPosition(),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3879
                            "prob.found.req", cause);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3880
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3881
            });
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3882
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3883
    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3884
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3885
    enum MethodResolutionPhase {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3886
        BASIC(false, false),
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3887
        BOX(true, false),
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3888
        VARARITY(true, true) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3889
            @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3890
            public Symbol mergeResults(Symbol bestSoFar, Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3891
                switch (sym.kind) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3892
                    case WRONG_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3893
                        return (bestSoFar.kind == WRONG_MTH || bestSoFar.kind == WRONG_MTHS) ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3894
                            bestSoFar :
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3895
                            sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3896
                    case ABSENT_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3897
                        return bestSoFar;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3898
                    default:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3899
                        return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3900
                }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3901
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3902
        };
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3903
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
  3904
        final boolean isBoxingRequired;
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
  3905
        final boolean isVarargsRequired;
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3906
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3907
        MethodResolutionPhase(boolean isBoxingRequired, boolean isVarargsRequired) {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3908
           this.isBoxingRequired = isBoxingRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3909
           this.isVarargsRequired = isVarargsRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3910
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3911
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3912
        public boolean isBoxingRequired() {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3913
            return isBoxingRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3914
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3915
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3916
        public boolean isVarargsRequired() {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3917
            return isVarargsRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3918
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3919
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3920
        public boolean isApplicable(boolean boxingEnabled, boolean varargsEnabled) {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3921
            return (varargsEnabled || !isVarargsRequired) &&
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3922
                   (boxingEnabled || !isBoxingRequired);
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3923
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3924
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3925
        public Symbol mergeResults(Symbol prev, Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3926
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3927
        }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3928
    }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3929
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3930
    final List<MethodResolutionPhase> methodResolutionSteps = List.of(BASIC, BOX, VARARITY);
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  3931
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3932
    /**
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3933
     * A resolution context is used to keep track of intermediate results of
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3934
     * overload resolution, such as list of method that are not applicable
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3935
     * (used to generate more precise diagnostics) and so on. Resolution contexts
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3936
     * can be nested - this means that when each overload resolution routine should
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3937
     * work within the resolution context it created.
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3938
     */
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3939
    class MethodResolutionContext {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3940
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3941
        private List<Candidate> candidates = List.nil();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3942
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3943
        MethodResolutionPhase step = null;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3944
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3945
        MethodCheck methodCheck = resolveMethodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3946
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3947
        private boolean internalResolution = false;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3948
        private DeferredAttr.AttrMode attrMode = DeferredAttr.AttrMode.SPECULATIVE;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3949
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3950
        void addInapplicableCandidate(Symbol sym, JCDiagnostic details) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3951
            Candidate c = new Candidate(currentResolutionContext.step, sym, details, null);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3952
            candidates = candidates.append(c);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3953
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3954
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3955
        void addApplicableCandidate(Symbol sym, Type mtype) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3956
            Candidate c = new Candidate(currentResolutionContext.step, sym, null, mtype);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3957
            candidates = candidates.append(c);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3958
        }
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  3959
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
  3960
        DeferredAttrContext deferredAttrContext(Symbol sym, InferenceContext inferenceContext, ResultInfo pendingResult, Warner warn) {
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
  3961
            return deferredAttr.new DeferredAttrContext(attrMode, sym, step, inferenceContext, pendingResult != null ? pendingResult.checkContext.deferredAttrContext() : deferredAttr.emptyDeferredAttrContext, warn);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  3962
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  3963
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3964
        /**
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3965
         * This class represents an overload resolution candidate. There are two
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3966
         * kinds of candidates: applicable methods and inapplicable methods;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3967
         * applicable methods have a pointer to the instantiated method type,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3968
         * while inapplicable candidates contain further details about the
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3969
         * reason why the method has been considered inapplicable.
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3970
         */
16301
b6fd735ea78e 6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents: 16294
diff changeset
  3971
        @SuppressWarnings("overrides")
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3972
        class Candidate {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3973
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3974
            final MethodResolutionPhase step;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3975
            final Symbol sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3976
            final JCDiagnostic details;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3977
            final Type mtype;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3978
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3979
            private Candidate(MethodResolutionPhase step, Symbol sym, JCDiagnostic details, Type mtype) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3980
                this.step = step;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3981
                this.sym = sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3982
                this.details = details;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3983
                this.mtype = mtype;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3984
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3985
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3986
            @Override
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3987
            public boolean equals(Object o) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3988
                if (o instanceof Candidate) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3989
                    Symbol s1 = this.sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3990
                    Symbol s2 = ((Candidate)o).sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3991
                    if  ((s1 != s2 &&
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3992
                            (s1.overrides(s2, s1.owner.type.tsym, types, false) ||
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3993
                            (s2.overrides(s1, s2.owner.type.tsym, types, false)))) ||
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3994
                            ((s1.isConstructor() || s2.isConstructor()) && s1.owner != s2.owner))
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3995
                        return true;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3996
                }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3997
                return false;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3998
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3999
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4000
            boolean isApplicable() {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4001
                return mtype != null;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4002
            }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4003
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4004
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4005
        DeferredAttr.AttrMode attrMode() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4006
            return attrMode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4007
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4008
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4009
        boolean internal() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4010
            return internalResolution;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4011
        }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4012
    }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4013
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4014
    MethodResolutionContext currentResolutionContext = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4015
}