langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
author vromero
Fri, 27 Mar 2015 10:11:21 -0700
changeset 29774 9d438163db79
parent 29554 6d7957bd6866
child 29776 984a79b71cfe
permissions -rw-r--r--
8075184: javac is mistakenly considering an missing enclosing instance error as an overload error Reviewed-by: mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
     2
 * Copyright (c) 1999, 2015, 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.*;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
    30
import com.sun.tools.javac.code.Scope.WriteableScope;
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
    31
import com.sun.tools.javac.code.Symbol.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    32
import com.sun.tools.javac.code.Type.*;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    33
import com.sun.tools.javac.comp.Attr.ResultInfo;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    34
import com.sun.tools.javac.comp.Check.CheckContext;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    35
import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    36
import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    37
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
    38
import com.sun.tools.javac.comp.Infer.InferenceContext;
15705
c4124695db0c 8007463: Cleanup inference related classes
mcimadamore
parents: 15385
diff changeset
    39
import com.sun.tools.javac.comp.Infer.FreeTypeListener;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
    40
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
    41
import com.sun.tools.javac.comp.Resolve.MethodResolutionDiagHelper.Template;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
    42
import com.sun.tools.javac.comp.Resolve.ReferenceLookupResult.StaticKind;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    43
import com.sun.tools.javac.jvm.*;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
    44
import com.sun.tools.javac.main.Option;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    45
import com.sun.tools.javac.tree.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    46
import com.sun.tools.javac.tree.JCTree.*;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
    47
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
    48
import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    49
import com.sun.tools.javac.util.*;
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
    50
import com.sun.tools.javac.util.DefinedBy.Api;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    51
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    52
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    53
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    54
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    55
import java.util.Arrays;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    56
import java.util.Collection;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    57
import java.util.EnumSet;
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
    58
import java.util.Iterator;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
    59
import java.util.LinkedHashMap;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    60
import java.util.Map;
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
    61
import java.util.function.BiPredicate;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
    62
import java.util.stream.Stream;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    63
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    64
import javax.lang.model.element.ElementVisitor;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    65
06bc494ca11e Initial load
duke
parents:
diff changeset
    66
import static com.sun.tools.javac.code.Flags.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
    67
import static com.sun.tools.javac.code.Flags.BLOCK;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
    68
import static com.sun.tools.javac.code.Flags.STATIC;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    69
import static com.sun.tools.javac.code.Kinds.*;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
    70
import static com.sun.tools.javac.code.Kinds.Kind.*;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
    71
import static com.sun.tools.javac.code.TypeTag.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    72
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
    73
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
    74
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    75
/** Helper class for name resolution, used mostly by the attribution phase.
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5846
diff changeset
    77
 *  <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
    78
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
public class Resolve {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
    83
    protected static final Context.Key<Resolve> resolveKey = new Context.Key<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1257
diff changeset
    85
    Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
    Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
    Symtab syms;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    88
    Attr attr;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    89
    DeferredAttr deferredAttr;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    90
    Check chk;
06bc494ca11e Initial load
duke
parents:
diff changeset
    91
    Infer infer;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24404
diff changeset
    92
    ClassFinder finder;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    93
    Types types;
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
    94
    JCDiagnostic.Factory diags;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
    95
    public final boolean allowMethodHandles;
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
    96
    public final boolean allowFunctionalInterfaceMostSpecific;
25435
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
    97
    public final boolean checkVarargsAccessAfterResolution;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
    private final boolean debugResolve;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
    99
    private final boolean compactMethodDiags;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   100
    final EnumSet<VerboseResolutionMode> verboseResolutionMode;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
   102
    WriteableScope polymorphicSignatureScope;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
   103
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   104
    protected Resolve(Context context) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   105
        context.put(resolveKey, this);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   106
        syms = Symtab.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   107
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   108
        varNotFound = new SymbolNotFoundError(ABSENT_VAR);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   109
        methodNotFound = new SymbolNotFoundError(ABSENT_MTH);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   110
        typeNotFound = new SymbolNotFoundError(ABSENT_TYP);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   111
        referenceNotFound = new ReferenceLookupResult(methodNotFound, null);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   112
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   113
        names = Names.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   114
        log = Log.instance(context);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   115
        attr = Attr.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   116
        deferredAttr = DeferredAttr.instance(context);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   117
        chk = Check.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   118
        infer = Infer.instance(context);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24404
diff changeset
   119
        finder = ClassFinder.instance(context);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   120
        types = Types.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   121
        diags = JCDiagnostic.Factory.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   122
        Source source = Source.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   123
        Options options = Options.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   124
        debugResolve = options.isSet("debugresolve");
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   125
        compactMethodDiags = options.isSet(Option.XDIAGS, "compact") ||
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   126
                options.isUnset(Option.XDIAGS) && options.isUnset("rawDiagnostics");
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   127
        verboseResolutionMode = VerboseResolutionMode.getVerboseResolutionMode(options);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   128
        Target target = Target.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   129
        allowMethodHandles = target.hasMethodHandles();
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
   130
        allowFunctionalInterfaceMostSpecific = source.allowFunctionalInterfaceMostSpecific();
25435
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   131
        checkVarargsAccessAfterResolution =
25008
969bfaae5bce 8036953: Fix timing of varargs access check, per JDK-8016205
vromero
parents: 24612
diff changeset
   132
                source.allowPostApplicabilityVarargsAccessCheck();
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
   133
        polymorphicSignatureScope = WriteableScope.create(syms.noSymbol);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   134
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   135
        inapplicableMethodException = new InapplicableMethodException(diags);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   136
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   137
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   138
    /** error symbols, which are returned when resolution fails
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
    private final SymbolNotFoundError varNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   141
    private final SymbolNotFoundError methodNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   142
    private final SymbolNotFoundError typeNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   143
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   144
    /** empty reference lookup result */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   145
    private final ReferenceLookupResult referenceNotFound;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   146
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   147
    public static Resolve instance(Context context) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   148
        Resolve instance = context.get(resolveKey);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   149
        if (instance == null)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   150
            instance = new Resolve(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   151
        return instance;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   152
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   153
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   154
    private static Symbol bestOf(Symbol s1,
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   155
                                 Symbol s2) {
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   156
        return s1.kind.betterThan(s2.kind) ? s1 : s2;
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   157
    }
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   158
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   159
    // <editor-fold defaultstate="collapsed" desc="Verbose resolution diagnostics support">
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   160
    enum VerboseResolutionMode {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   161
        SUCCESS("success"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   162
        FAILURE("failure"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   163
        APPLICABLE("applicable"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   164
        INAPPLICABLE("inapplicable"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   165
        DEFERRED_INST("deferred-inference"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   166
        PREDEF("predef"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   167
        OBJECT_INIT("object-init"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   168
        INTERNAL("internal");
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   169
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
   170
        final String opt;
10816
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
        private VerboseResolutionMode(String opt) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   173
            this.opt = opt;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   174
        }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   175
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   176
        static EnumSet<VerboseResolutionMode> getVerboseResolutionMode(Options opts) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   177
            String s = opts.get("verboseResolution");
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   178
            EnumSet<VerboseResolutionMode> res = EnumSet.noneOf(VerboseResolutionMode.class);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   179
            if (s == null) return res;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   180
            if (s.contains("all")) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   181
                res = EnumSet.allOf(VerboseResolutionMode.class);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   182
            }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   183
            Collection<String> args = Arrays.asList(s.split(","));
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   184
            for (VerboseResolutionMode mode : values()) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   185
                if (args.contains(mode.opt)) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   186
                    res.add(mode);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   187
                } else if (args.contains("-" + mode.opt)) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   188
                    res.remove(mode);
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
            return res;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   192
        }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   193
    }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   194
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   195
    void reportVerboseResolutionDiagnostic(DiagnosticPosition dpos, Name name, Type site,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   196
            List<Type> argtypes, List<Type> typeargtypes, Symbol bestSoFar) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
   197
        boolean success = !bestSoFar.kind.isResolutionError();
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   198
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   199
        if (success && !verboseResolutionMode.contains(VerboseResolutionMode.SUCCESS)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   200
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   201
        } else if (!success && !verboseResolutionMode.contains(VerboseResolutionMode.FAILURE)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   202
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   203
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   204
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   205
        if (bestSoFar.name == names.init &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   206
                bestSoFar.owner == syms.objectType.tsym &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   207
                !verboseResolutionMode.contains(VerboseResolutionMode.OBJECT_INIT)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   208
            return; //skip diags for Object constructor resolution
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   209
        } else if (site == syms.predefClass.type &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   210
                !verboseResolutionMode.contains(VerboseResolutionMode.PREDEF)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   211
            return; //skip spurious diags for predef symbols (i.e. operators)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   212
        } else if (currentResolutionContext.internalResolution &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   213
                !verboseResolutionMode.contains(VerboseResolutionMode.INTERNAL)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   214
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   215
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   216
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   217
        int pos = 0;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   218
        int mostSpecificPos = -1;
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19940
diff changeset
   219
        ListBuffer<JCDiagnostic> subDiags = new ListBuffer<>();
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   220
        for (Candidate c : currentResolutionContext.candidates) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   221
            if (currentResolutionContext.step != c.step ||
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   222
                    (c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.APPLICABLE)) ||
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   223
                    (!c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.INAPPLICABLE))) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   224
                continue;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   225
            } else {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   226
                subDiags.append(c.isApplicable() ?
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   227
                        getVerboseApplicableCandidateDiag(pos, c.sym, c.mtype) :
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   228
                        getVerboseInapplicableCandidateDiag(pos, c.sym, c.details));
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   229
                if (c.sym == bestSoFar)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   230
                    mostSpecificPos = pos;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   231
                pos++;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   232
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   233
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   234
        String key = success ? "verbose.resolve.multi" : "verbose.resolve.multi.1";
29554
6d7957bd6866 8074100: Turn Type.Mapping into a true visitor
mcimadamore
parents: 29292
diff changeset
   235
        List<Type> argtypes2 = argtypes.map(deferredAttr.new RecoveryDeferredTypeMap(AttrMode.SPECULATIVE, bestSoFar, currentResolutionContext.step));
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   236
        JCDiagnostic main = diags.note(log.currentSource(), dpos, key, name,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   237
                site.tsym, mostSpecificPos, currentResolutionContext.step,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   238
                methodArguments(argtypes2),
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   239
                methodArguments(typeargtypes));
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   240
        JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, subDiags.toList());
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   241
        log.report(d);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   242
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   243
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   244
    JCDiagnostic getVerboseApplicableCandidateDiag(int pos, Symbol sym, Type inst) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   245
        JCDiagnostic subDiag = null;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   246
        if (sym.type.hasTag(FORALL)) {
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   247
            subDiag = diags.fragment("partial.inst.sig", inst);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   248
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   249
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   250
        String key = subDiag == null ?
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   251
                "applicable.method.found" :
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   252
                "applicable.method.found.1";
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   253
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   254
        return diags.fragment(key, pos, sym, subDiag);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   255
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   256
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   257
    JCDiagnostic getVerboseInapplicableCandidateDiag(int pos, Symbol sym, JCDiagnostic subDiag) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   258
        return diags.fragment("not.applicable.method.found", pos, sym, subDiag);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   259
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   260
    // </editor-fold>
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
06bc494ca11e Initial load
duke
parents:
diff changeset
   262
/* ************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
 * Identifier resolution
06bc494ca11e Initial load
duke
parents:
diff changeset
   264
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   265
06bc494ca11e Initial load
duke
parents:
diff changeset
   266
    /** An environment is "static" if its static level is greater than
06bc494ca11e Initial load
duke
parents:
diff changeset
   267
     *  the one of its outer environment
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
     */
14056
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 14052
diff changeset
   269
    protected static boolean isStatic(Env<AttrContext> env) {
22440
d40c30326317 8028389: NullPointerException compiling annotation values that have bodies
alundblad
parents: 22167
diff changeset
   270
        return env.outer != null && env.info.staticLevel > env.outer.info.staticLevel;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   272
06bc494ca11e Initial load
duke
parents:
diff changeset
   273
    /** An environment is an "initializer" if it is a constructor or
06bc494ca11e Initial load
duke
parents:
diff changeset
   274
     *  an instance initializer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   275
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   276
    static boolean isInitializer(Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   277
        Symbol owner = env.info.scope.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   278
        return owner.isConstructor() ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   279
            owner.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   280
            (owner.kind == VAR ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
             owner.kind == MTH && (owner.flags() & BLOCK) != 0) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
            (owner.flags() & STATIC) == 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
   283
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   284
06bc494ca11e Initial load
duke
parents:
diff changeset
   285
    /** Is class accessible in given evironment?
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
     *  @param env    The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
     *  @param c      The class whose accessibility is checked.
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   289
    public boolean isAccessible(Env<AttrContext> env, TypeSymbol c) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   290
        return isAccessible(env, c, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   291
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   292
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   293
    public boolean isAccessible(Env<AttrContext> env, TypeSymbol c, boolean checkInner) {
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   294
        boolean isAccessible = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   295
        switch ((short)(c.flags() & AccessFlags)) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   296
            case PRIVATE:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   297
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   298
                    env.enclClass.sym.outermostClass() ==
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   299
                    c.owner.outermostClass();
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   300
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   301
            case 0:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   302
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   303
                    env.toplevel.packge == c.owner // fast special case
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
                    env.toplevel.packge == c.packge()
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   306
                    ||
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   307
                    // Hack: this case is added since synthesized default constructors
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   308
                    // of anonymous classes should be allowed to access
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   309
                    // classes which would be inaccessible otherwise.
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   310
                    env.enclMethod != null &&
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   311
                    (env.enclMethod.mods.flags & ANONCONSTR) != 0;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   312
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   313
            default: // error recovery
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   314
            case PUBLIC:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   315
                isAccessible = true;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   316
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   317
            case PROTECTED:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   318
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   319
                    env.toplevel.packge == c.owner // fast special case
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
                    env.toplevel.packge == c.packge()
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   322
                    ||
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   323
                    isInnerSubClass(env.enclClass.sym, c.owner);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   324
                break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   325
        }
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   326
        return (checkInner == false || c.type.getEnclosingType() == Type.noType) ?
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   327
            isAccessible :
7637
467bc8fc514e 6990134: minor (but red) findbugs warnings
jjg
parents: 7635
diff changeset
   328
            isAccessible && isAccessible(env, c.type.getEnclosingType(), checkInner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   329
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   330
    //where
06bc494ca11e Initial load
duke
parents:
diff changeset
   331
        /** Is given class a subclass of given base class, or an inner class
06bc494ca11e Initial load
duke
parents:
diff changeset
   332
         *  of a subclass?
06bc494ca11e Initial load
duke
parents:
diff changeset
   333
         *  Return null if no such class exists.
06bc494ca11e Initial load
duke
parents:
diff changeset
   334
         *  @param c     The class which is the subclass or is contained in it.
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
         *  @param base  The base class
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
        private boolean isInnerSubClass(ClassSymbol c, Symbol base) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   338
            while (c != null && !c.isSubClass(base, types)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   339
                c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   340
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   341
            return c != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   342
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   343
06bc494ca11e Initial load
duke
parents:
diff changeset
   344
    boolean isAccessible(Env<AttrContext> env, Type t) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   345
        return isAccessible(env, t, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   346
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   347
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   348
    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
   349
        return (t.hasTag(ARRAY))
24612
75dc732b45af 8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents: 24604
diff changeset
   350
            ? isAccessible(env, types.cvarUpperBound(types.elemtype(t)))
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   351
            : isAccessible(env, t.tsym, checkInner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   352
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   353
17998
02a5abb2ae2f 7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents: 17804
diff changeset
   354
    /** Is symbol accessible as a member of given type in given environment?
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   355
     *  @param env    The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
     *  @param site   The type of which the tested symbol is regarded
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
     *                as a member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   358
     *  @param sym    The symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   359
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   360
    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
   361
        return isAccessible(env, site, sym, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   362
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   363
    public boolean isAccessible(Env<AttrContext> env, Type site, Symbol sym, boolean checkInner) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   364
        if (sym.name == names.init && sym.owner != site.tsym) return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
        switch ((short)(sym.flags() & AccessFlags)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
        case PRIVATE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   367
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   368
                (env.enclClass.sym == sym.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   369
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
                 env.enclClass.sym.outermostClass() ==
06bc494ca11e Initial load
duke
parents:
diff changeset
   371
                 sym.owner.outermostClass())
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
                &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   373
                sym.isInheritedIn(site.tsym, types);
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
        case 0:
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   376
                (env.toplevel.packge == sym.owner.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   378
                 env.toplevel.packge == sym.packge())
06bc494ca11e Initial load
duke
parents:
diff changeset
   379
                &&
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   380
                isAccessible(env, site, checkInner)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
                &&
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   382
                sym.isInheritedIn(site.tsym, types)
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   383
                &&
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   384
                notOverriddenIn(site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
        case PROTECTED:
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
                (env.toplevel.packge == sym.owner.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   388
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   389
                 env.toplevel.packge == sym.packge()
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   391
                 isProtectedAccessible(sym, env.enclClass.sym, site)
06bc494ca11e Initial load
duke
parents:
diff changeset
   392
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   393
                 // OK to select instance method or field from 'super' or type name
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
                 // (but type names should be disallowed elsewhere!)
06bc494ca11e Initial load
duke
parents:
diff changeset
   395
                 env.info.selectSuper && (sym.flags() & STATIC) == 0 && sym.kind != TYP)
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
                &&
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   397
                isAccessible(env, site, checkInner)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   398
                &&
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   399
                notOverriddenIn(site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   400
        default: // this case includes erroneous combinations as well
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   401
            return isAccessible(env, site, checkInner) && notOverriddenIn(site, sym);
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   402
        }
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   403
    }
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   404
    //where
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   405
    /* `sym' is accessible only if not overridden by
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   406
     * another symbol which is a member of `site'
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   407
     * (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
   408
     * 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
   409
     * cannot be overridden (e.g. MH.invokeExact(Object[])).
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   410
     */
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   411
    private boolean notOverriddenIn(Type site, Symbol sym) {
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   412
        if (sym.kind != MTH || sym.isConstructor() || sym.isStatic())
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   413
            return true;
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   414
        else {
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   415
            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
   416
            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
   417
                    !types.isSubSignature(types.memberType(site, s2), types.memberType(site, sym)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   418
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   419
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   420
    //where
06bc494ca11e Initial load
duke
parents:
diff changeset
   421
        /** Is given protected symbol accessible if it is selected from given site
06bc494ca11e Initial load
duke
parents:
diff changeset
   422
         *  and the selection takes place in given class?
06bc494ca11e Initial load
duke
parents:
diff changeset
   423
         *  @param sym     The symbol with protected access
06bc494ca11e Initial load
duke
parents:
diff changeset
   424
         *  @param c       The class where the access takes place
06bc494ca11e Initial load
duke
parents:
diff changeset
   425
         *  @site          The type of the qualifier
06bc494ca11e Initial load
duke
parents:
diff changeset
   426
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   427
        private
06bc494ca11e Initial load
duke
parents:
diff changeset
   428
        boolean isProtectedAccessible(Symbol sym, ClassSymbol c, Type site) {
21024
e1efbecefefa 8025816: javac crash with method reference with a type variable as the site
vromero
parents: 20249
diff changeset
   429
            Type newSite = site.hasTag(TYPEVAR) ? site.getUpperBound() : site;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   430
            while (c != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   431
                   !(c.isSubClass(sym.owner, types) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   432
                     (c.flags() & INTERFACE) == 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
                     // In JLS 2e 6.6.2.1, the subclass restriction applies
06bc494ca11e Initial load
duke
parents:
diff changeset
   434
                     // only to instance fields and methods -- types are excluded
06bc494ca11e Initial load
duke
parents:
diff changeset
   435
                     // regardless of whether they are declared 'static' or not.
21024
e1efbecefefa 8025816: javac crash with method reference with a type variable as the site
vromero
parents: 20249
diff changeset
   436
                     ((sym.flags() & STATIC) != 0 || sym.kind == TYP || newSite.tsym.isSubClass(c, types))))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   437
                c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   438
            return c != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   439
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   440
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   441
    /**
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   442
     * Performs a recursive scan of a type looking for accessibility problems
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   443
     * from current attribution environment
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   444
     */
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   445
    void checkAccessibleType(Env<AttrContext> env, Type t) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   446
        accessibilityChecker.visit(t, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   447
    }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   448
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   449
    /**
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   450
     * Accessibility type-visitor
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   451
     */
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   452
    Types.SimpleVisitor<Void, Env<AttrContext>> accessibilityChecker =
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   453
            new Types.SimpleVisitor<Void, Env<AttrContext>>() {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   454
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   455
        void visit(List<Type> ts, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   456
            for (Type t : ts) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   457
                visit(t, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   458
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   459
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   460
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   461
        public Void visitType(Type t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   462
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   463
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   464
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   465
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   466
        public Void visitArrayType(ArrayType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   467
            visit(t.elemtype, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   468
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   469
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   470
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   471
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   472
        public Void visitClassType(ClassType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   473
            visit(t.getTypeArguments(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   474
            if (!isAccessible(env, t, true)) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   475
                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
   476
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   477
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   478
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   479
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   480
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   481
        public Void visitWildcardType(WildcardType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   482
            visit(t.type, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   483
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   484
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   485
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   486
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   487
        public Void visitMethodType(MethodType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   488
            visit(t.getParameterTypes(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   489
            visit(t.getReturnType(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   490
            visit(t.getThrownTypes(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   491
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   492
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   493
    };
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   494
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
    /** 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
   496
     *  given type arguments and argument types. If successful, return
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   497
     *  the method's instantiated type, else return null.
06bc494ca11e Initial load
duke
parents:
diff changeset
   498
     *  The instantiation will take into account an additional leading
06bc494ca11e Initial load
duke
parents:
diff changeset
   499
     *  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
   500
     *  of an under determined site. In this case, we treat site as an additional
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   501
     *  parameter and the parameters of the class containing the method as
06bc494ca11e Initial load
duke
parents:
diff changeset
   502
     *  additional type variables that get instantiated.
06bc494ca11e Initial load
duke
parents:
diff changeset
   503
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   504
     *  @param env         The current environment
06bc494ca11e Initial load
duke
parents:
diff changeset
   505
     *  @param site        The type of which the method is a member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   506
     *  @param m           The method symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   507
     *  @param argtypes    The invocation's given value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   508
     *  @param typeargtypes    The invocation's given type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   509
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   510
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
   511
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   512
    Type rawInstantiate(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
   513
                        Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
   514
                        Symbol m,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   515
                        ResultInfo resultInfo,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   516
                        List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   517
                        List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   518
                        boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   519
                        boolean useVarargs,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
   520
                        Warner warn) throws Infer.InferenceException {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
        Type mt = types.memberType(site, m);
06bc494ca11e Initial load
duke
parents:
diff changeset
   522
        // tvars is the list of formal type variables for which type arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
        // need to inferred.
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   524
        List<Type> tvars = List.nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   525
        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
   526
        if (!mt.hasTag(FORALL) && typeargtypes.nonEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   527
            // 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
   528
            // 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
   529
        } else if (mt.hasTag(FORALL) && typeargtypes.nonEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   530
            ForAll pmt = (ForAll) mt;
06bc494ca11e Initial load
duke
parents:
diff changeset
   531
            if (typeargtypes.length() != pmt.tvars.length())
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   532
                throw inapplicableMethodException.setMessage("arg.length.mismatch"); // not enough args
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   533
            // Check type arguments are within bounds
06bc494ca11e Initial load
duke
parents:
diff changeset
   534
            List<Type> formals = pmt.tvars;
06bc494ca11e Initial load
duke
parents:
diff changeset
   535
            List<Type> actuals = typeargtypes;
06bc494ca11e Initial load
duke
parents:
diff changeset
   536
            while (formals.nonEmpty() && actuals.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   537
                List<Type> bounds = types.subst(types.getBounds((TypeVar)formals.head),
06bc494ca11e Initial load
duke
parents:
diff changeset
   538
                                                pmt.tvars, typeargtypes);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   539
                for (; bounds.nonEmpty(); bounds = bounds.tail) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   540
                    if (!types.isSubtypeUnchecked(actuals.head, bounds.head, warn))
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   541
                        throw inapplicableMethodException.setMessage("explicit.param.do.not.conform.to.bounds",actuals.head, bounds);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   542
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   543
                formals = formals.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   544
                actuals = actuals.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   545
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   546
            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
   547
        } else if (mt.hasTag(FORALL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
            ForAll pmt = (ForAll) mt;
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
            List<Type> tvars1 = types.newInstances(pmt.tvars);
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
            tvars = tvars.appendList(tvars1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   551
            mt = types.subst(pmt.qtype, pmt.tvars, tvars1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   552
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   553
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
        // 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
   555
        boolean instNeeded = tvars.tail != null; /*inlined: tvars.nonEmpty()*/
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   556
        for (List<Type> l = argtypes;
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
             l.tail != null/*inlined: l.nonEmpty()*/ && !instNeeded;
06bc494ca11e Initial load
duke
parents:
diff changeset
   558
             l = l.tail) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   559
            if (l.head.hasTag(FORALL)) instNeeded = true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   560
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   561
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   562
        if (instNeeded) {
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
   563
            return infer.instantiateMethod(env,
5489
e7af65bf7577 6730476: invalid "unchecked generic array" warning
mcimadamore
parents: 5321
diff changeset
   564
                                    tvars,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   565
                                    (MethodType)mt,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   566
                                    resultInfo,
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   567
                                    (MethodSymbol)m,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   568
                                    argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   569
                                    allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   570
                                    useVarargs,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   571
                                    currentResolutionContext,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   572
                                    warn);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   573
        }
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   574
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
   575
        DeferredAttr.DeferredAttrContext dc = currentResolutionContext.deferredAttrContext(m, infer.emptyContext, resultInfo, warn);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
   576
        currentResolutionContext.methodCheck.argumentsAcceptable(env, dc,
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   577
                                argtypes, mt.getParameterTypes(), warn);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
   578
        dc.complete();
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   579
        return mt;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   580
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   581
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   582
    Type checkMethod(Env<AttrContext> env,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   583
                     Type site,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   584
                     Symbol m,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   585
                     ResultInfo resultInfo,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   586
                     List<Type> argtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   587
                     List<Type> typeargtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   588
                     Warner warn) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   589
        MethodResolutionContext prevContext = currentResolutionContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   590
        try {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   591
            currentResolutionContext = new MethodResolutionContext();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   592
            currentResolutionContext.attrMode = DeferredAttr.AttrMode.CHECK;
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   593
            if (env.tree.hasTag(JCTree.Tag.REFERENCE)) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   594
                //method/constructor references need special check class
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   595
                //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
   596
                //during an unsticking round)
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   597
                currentResolutionContext.methodCheck =
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   598
                        new MethodReferenceCheck(resultInfo.checkContext.inferenceContext());
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   599
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   600
            MethodResolutionPhase step = currentResolutionContext.step = env.info.pendingResolutionPhase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   601
            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
   602
                    step.isBoxingRequired(), step.isVarargsRequired(), warn);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   603
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   604
        finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   605
            currentResolutionContext = prevContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   606
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   607
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   608
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   609
    /** Same but returns null instead throwing a NoInstanceException
06bc494ca11e Initial load
duke
parents:
diff changeset
   610
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   611
    Type instantiate(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
   612
                     Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
   613
                     Symbol m,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   614
                     ResultInfo resultInfo,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   615
                     List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   616
                     List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   617
                     boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   618
                     boolean useVarargs,
06bc494ca11e Initial load
duke
parents:
diff changeset
   619
                     Warner warn) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   620
        try {
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   621
            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
   622
                                  allowBoxing, useVarargs, warn);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   623
        } catch (InapplicableMethodException ex) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   624
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   625
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   626
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   627
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   628
    /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   629
     * 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
   630
     * 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
   631
     * 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
   632
     * 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
   633
     * this interfaces allows to easily add new pluggable method check routines.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   634
     */
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   635
    interface MethodCheck {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   636
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   637
         * 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
   638
         * 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
   639
         * 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
   640
         * is assumed to be thrown.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   641
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   642
        void argumentsAcceptable(Env<AttrContext> env,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   643
                                DeferredAttrContext deferredAttrContext,
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
   644
                                List<Type> argtypes,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   645
                                List<Type> formals,
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   646
                                Warner warn);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   647
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   648
        /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   649
         * 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
   650
         * most specific check.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   651
         */
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   652
        MethodCheck mostSpecificCheck(List<Type> actuals);
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   653
    }
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   654
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   655
    /**
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   656
     * Helper enum defining all method check diagnostics (used by resolveMethodCheck).
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   657
     */
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   658
    enum MethodCheckDiag {
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
         * Actuals and formals differs in length.
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
        ARITY_MISMATCH("arg.length.mismatch", "infer.arg.length.mismatch"),
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
         * An actual is incompatible with a formal.
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
        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
   667
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   668
         * An actual is incompatible with the varargs element 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
        VARARG_MISMATCH("varargs.argument.mismatch", "infer.varargs.argument.mismatch"),
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   671
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   672
         * The varargs element type is inaccessible.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   673
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   674
        INACCESSIBLE_VARARGS("inaccessible.varargs.type", "inaccessible.varargs.type");
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   675
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   676
        final String basicKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   677
        final String inferKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   678
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   679
        MethodCheckDiag(String basicKey, String inferKey) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   680
            this.basicKey = basicKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   681
            this.inferKey = inferKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   682
        }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   683
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   684
        String regex() {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   685
            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
   686
        }
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   687
    }
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   688
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   689
    /**
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   690
     * 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
   691
     * of their formal parameter types.
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   692
     */
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   693
    MethodCheck nilMethodCheck = new MethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   694
        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
   695
            //do nothing - method always applicable regardless of actuals
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
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   698
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   699
            return this;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   700
        }
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
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   703
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   704
     * 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
   705
     * 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
   706
     * 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
   707
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   708
    abstract class AbstractMethodCheck implements MethodCheck {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   709
        @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   710
        public void argumentsAcceptable(final Env<AttrContext> env,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   711
                                    DeferredAttrContext deferredAttrContext,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   712
                                    List<Type> argtypes,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   713
                                    List<Type> formals,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   714
                                    Warner warn) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   715
            //should we expand formals?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   716
            boolean useVarargs = deferredAttrContext.phase.isVarargsRequired();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   717
            List<JCExpression> trees = TreeInfo.args(env.tree);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   718
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   719
            //inference context used during this method check
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   720
            InferenceContext inferenceContext = deferredAttrContext.inferenceContext;
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
            Type varargsFormal = useVarargs ? formals.last() : null;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   723
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   724
            if (varargsFormal == null &&
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   725
                    argtypes.size() != formals.size()) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   726
                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
   727
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   728
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   729
            while (argtypes.nonEmpty() && formals.head != varargsFormal) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   730
                DiagnosticPosition pos = trees != null ? trees.head : null;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   731
                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
   732
                argtypes = argtypes.tail;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   733
                formals = formals.tail;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   734
                trees = trees != null ? trees.tail : trees;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   735
            }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   736
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   737
            if (formals.head != varargsFormal) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   738
                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
   739
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   740
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   741
            if (useVarargs) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   742
                //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
   743
                //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
   744
                final Type elt = types.elemtype(varargsFormal);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   745
                while (argtypes.nonEmpty()) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   746
                    DiagnosticPosition pos = trees != null ? trees.head : null;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   747
                    checkArg(pos, true, argtypes.head, elt, deferredAttrContext, warn);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   748
                    argtypes = argtypes.tail;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   749
                    trees = trees != null ? trees.tail : trees;
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   750
                }
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
   751
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   752
        }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   753
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   754
        /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   755
         * 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
   756
         */
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   757
        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
   758
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   759
        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
   760
            boolean inferDiag = inferenceContext != infer.emptyContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   761
            InapplicableMethodException ex = inferDiag ?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   762
                    infer.inferenceException : inapplicableMethodException;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   763
            if (inferDiag && (!diag.inferKey.equals(diag.basicKey))) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   764
                Object[] args2 = new Object[args.length + 1];
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   765
                System.arraycopy(args, 0, args2, 1, args.length);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   766
                args2[0] = inferenceContext.inferenceVars();
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   767
                args = args2;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   768
            }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   769
            String key = inferDiag ? diag.inferKey : diag.basicKey;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   770
            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
   771
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   772
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   773
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   774
            return nilMethodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   775
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   776
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   777
    }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   778
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   779
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   780
     * 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
   781
     * supplied conforms to the method signature.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   782
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   783
    MethodCheck arityMethodCheck = new AbstractMethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   784
        @Override
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   785
        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
   786
            //do nothing - actual always compatible to formals
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   787
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   788
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   789
        @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   790
        public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   791
            return "arityMethodCheck";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   792
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   793
    };
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   794
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   795
    List<Type> dummyArgs(int length) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19940
diff changeset
   796
        ListBuffer<Type> buf = new ListBuffer<>();
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   797
        for (int i = 0 ; i < length ; i++) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   798
            buf.append(Type.noType);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   799
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   800
        return buf.toList();
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   801
    }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   802
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   803
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   804
     * 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
   805
     * 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
   806
     * 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
   807
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   808
     * 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
   809
     * 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
   810
     * 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
   811
     * 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
   812
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   813
     * 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
   814
     * 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
   815
     * 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
   816
     * 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
   817
     * 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
   818
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   819
     * 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
   820
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   821
    MethodCheck resolveMethodCheck = new AbstractMethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   822
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   823
        @Override
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   824
        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
   825
            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
   826
            mresult.check(pos, actual);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   827
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   828
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   829
        @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   830
        public void argumentsAcceptable(final Env<AttrContext> env,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   831
                                    DeferredAttrContext deferredAttrContext,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   832
                                    List<Type> argtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   833
                                    List<Type> formals,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   834
                                    Warner warn) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   835
            super.argumentsAcceptable(env, deferredAttrContext, argtypes, formals, warn);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   836
            //should we expand formals?
25435
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   837
            if (deferredAttrContext.phase.isVarargsRequired()) {
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   838
                Type typeToCheck = null;
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   839
                if (!checkVarargsAccessAfterResolution) {
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   840
                    typeToCheck = types.elemtype(formals.last());
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   841
                } else if (deferredAttrContext.mode == AttrMode.CHECK) {
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   842
                    typeToCheck = types.erasure(types.elemtype(formals.last()));
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   843
                }
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   844
                if (typeToCheck != null) {
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   845
                    varargsAccessible(env, typeToCheck, deferredAttrContext.inferenceContext);
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   846
                }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   847
            }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   848
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   849
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   850
        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
   851
            if (inferenceContext.free(t)) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   852
                inferenceContext.addFreeTypeListener(List.of(t), new FreeTypeListener() {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   853
                    @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   854
                    public void typesInferred(InferenceContext inferenceContext) {
15705
c4124695db0c 8007463: Cleanup inference related classes
mcimadamore
parents: 15385
diff changeset
   855
                        varargsAccessible(env, inferenceContext.asInstType(t), inferenceContext);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   856
                    }
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
            } else {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   859
                if (!isAccessible(env, t)) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   860
                    Symbol location = env.enclClass.sym;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   861
                    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
   862
                }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   863
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   864
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   865
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   866
        private ResultInfo methodCheckResult(final boolean varargsCheck, Type to,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   867
                final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   868
            CheckContext checkContext = new MethodCheckContext(!deferredAttrContext.phase.isBoxingRequired(), deferredAttrContext, rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   869
                MethodCheckDiag methodDiag = varargsCheck ?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   870
                                 MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   871
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   872
                @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   873
                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
   874
                    reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   875
                }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   876
            };
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   877
            return new MethodResultInfo(to, checkContext);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   878
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   879
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   880
        @Override
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   881
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   882
            return new MostSpecificCheck(actuals);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   883
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   884
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   885
        @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   886
        public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   887
            return "resolveMethodCheck";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   888
        }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   889
    };
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   890
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   891
    /**
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   892
     * This class handles method reference applicability checks; since during
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   893
     * these checks it's sometime possible to have inference variables on
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   894
     * the actual argument types list, the method applicability check must be
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   895
     * extended so that inference variables are 'opened' as needed.
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   896
     */
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   897
    class MethodReferenceCheck extends AbstractMethodCheck {
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
        InferenceContext pendingInferenceContext;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   900
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   901
        MethodReferenceCheck(InferenceContext pendingInferenceContext) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   902
            this.pendingInferenceContext = pendingInferenceContext;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   903
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   904
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   905
        @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   906
        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
   907
            ResultInfo mresult = methodCheckResult(varargs, formal, deferredAttrContext, warn);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   908
            mresult.check(pos, actual);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   909
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   911
        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
   912
                final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   913
            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
   914
                MethodCheckDiag methodDiag = varargsCheck ?
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   915
                                 MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   916
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   917
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   918
                public boolean compatible(Type found, Type req, Warner warn) {
23132
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
   919
                    found = pendingInferenceContext.asUndetVar(found);
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   920
                    if (found.hasTag(UNDETVAR) && req.isPrimitive()) {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   921
                        req = types.boxedClass(req).type;
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   922
                    }
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   923
                    return super.compatible(found, req, warn);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   924
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   925
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   926
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   927
                public void report(DiagnosticPosition pos, JCDiagnostic details) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   928
                    reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   929
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   930
            };
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   931
            return new MethodResultInfo(to, checkContext);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   932
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   933
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   934
        @Override
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   935
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   936
            return new MostSpecificCheck(actuals);
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   937
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   938
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   939
        @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   940
        public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   941
            return "MethodReferenceCheck";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   942
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
   943
    }
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   944
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   945
    /**
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   946
     * 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
   947
     * context might contain inference variables.
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   948
     */
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   949
    abstract class MethodCheckContext implements CheckContext {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   950
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   951
        boolean strict;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   952
        DeferredAttrContext deferredAttrContext;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   953
        Warner rsWarner;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   954
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   955
        public MethodCheckContext(boolean strict, DeferredAttrContext deferredAttrContext, Warner rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   956
           this.strict = strict;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   957
           this.deferredAttrContext = deferredAttrContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   958
           this.rsWarner = rsWarner;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   959
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   960
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   961
        public boolean compatible(Type found, Type req, Warner warn) {
25279
a665d5cbb8c3 8044546: Crash on faulty reduce/lambda
vromero
parents: 25008
diff changeset
   962
            InferenceContext inferenceContext = deferredAttrContext.inferenceContext;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   963
            return strict ?
25279
a665d5cbb8c3 8044546: Crash on faulty reduce/lambda
vromero
parents: 25008
diff changeset
   964
                    types.isSubtypeUnchecked(inferenceContext.asUndetVar(found), inferenceContext.asUndetVar(req), warn) :
a665d5cbb8c3 8044546: Crash on faulty reduce/lambda
vromero
parents: 25008
diff changeset
   965
                    types.isConvertible(inferenceContext.asUndetVar(found), inferenceContext.asUndetVar(req), warn);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   966
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   967
13438
83729994273a 7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents: 12915
diff changeset
   968
        public void report(DiagnosticPosition pos, JCDiagnostic details) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   969
            throw inapplicableMethodException.setMessage(details);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   970
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   971
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   972
        public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   973
            return rsWarner;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   974
        }
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   975
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   976
        public InferenceContext inferenceContext() {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   977
            return deferredAttrContext.inferenceContext;
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   978
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   979
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   980
        public DeferredAttrContext deferredAttrContext() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   981
            return deferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   982
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   983
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   984
        @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   985
        public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   986
            return "MethodCheckContext";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   987
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   988
    }
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   989
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   990
    /**
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   991
     * 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
   992
     * for deferred types goes through special path.
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   993
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   994
    class MethodResultInfo extends ResultInfo {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   995
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   996
        public MethodResultInfo(Type pt, CheckContext checkContext) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   997
            attr.super(KindSelector.VAL, pt, checkContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   998
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   999
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1000
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1001
        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
  1002
            if (found.hasTag(DEFERRED)) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1003
                DeferredType dt = (DeferredType)found;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1004
                return dt.check(this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1005
            } else {
28336
9a6ae3c3efb5 8066871: java.lang.VerifyError: Bad local variable type - local final String
mcimadamore
parents: 28331
diff changeset
  1006
                Type uResult = U(found);
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1007
                Type capturedType = pos == null || pos.getTree() == null ?
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1008
                        types.capture(uResult) :
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1009
                        checkContext.inferenceContext()
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1010
                            .cachedCapture(pos.getTree(), uResult, true);
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1011
                return super.check(pos, chk.checkNonVoid(pos, capturedType));
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
  1012
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1013
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1014
18911
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1015
        /**
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1016
         * javac has a long-standing 'simplification' (see 6391995):
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1017
         * given an actual argument type, the method check is performed
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1018
         * on its upper bound. This leads to inconsistencies when an
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1019
         * argument type is checked against itself. For example, given
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1020
         * a type-variable T, it is not true that {@code U(T) <: T},
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1021
         * so we need to guard against that.
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1022
         */
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1023
        private Type U(Type found) {
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1024
            return found == pt ?
24612
75dc732b45af 8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents: 24604
diff changeset
  1025
                    found : types.cvarUpperBound(found);
18911
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1026
        }
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1027
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1028
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1029
        protected MethodResultInfo dup(Type newPt) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1030
            return new MethodResultInfo(newPt, checkContext);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1031
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1032
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1033
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1034
        protected ResultInfo dup(CheckContext newContext) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1035
            return new MethodResultInfo(pt, newContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1036
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1037
    }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1038
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1039
    /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1040
     * 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
  1041
     * 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
  1042
     * 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
  1043
     * argument types A.
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1044
     */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1045
    class MostSpecificCheck implements MethodCheck {
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
        List<Type> actuals;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1048
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1049
        MostSpecificCheck(List<Type> actuals) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1050
            this.actuals = actuals;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1051
        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1052
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1053
        @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1054
        public void argumentsAcceptable(final Env<AttrContext> env,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1055
                                    DeferredAttrContext deferredAttrContext,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1056
                                    List<Type> formals1,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1057
                                    List<Type> formals2,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1058
                                    Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1059
            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
  1060
            while (formals2.nonEmpty()) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1061
                ResultInfo mresult = methodCheckResult(formals2.head, deferredAttrContext, warn, actuals.head);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1062
                mresult.check(null, formals1.head);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1063
                formals1 = formals1.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1064
                formals2 = formals2.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1065
                actuals = actuals.isEmpty() ? actuals : actuals.tail;
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
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
        * 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
  1071
        */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1072
        ResultInfo methodCheckResult(Type to, DeferredAttr.DeferredAttrContext deferredAttrContext,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1073
               Warner rsWarner, Type actual) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1074
            return attr.new ResultInfo(KindSelector.VAL, to,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1075
                   new MostSpecificCheckContext(deferredAttrContext, rsWarner, actual));
15374
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
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1078
        /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1079
         * 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
  1080
         * 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
  1081
         * a full blown structural analysis is carried out.
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
        class MostSpecificCheckContext extends MethodCheckContext {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1084
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1085
            Type actual;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1086
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1087
            public MostSpecificCheckContext(DeferredAttrContext deferredAttrContext, Warner rsWarner, Type actual) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1088
                super(true, deferredAttrContext, rsWarner);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1089
                this.actual = actual;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1090
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1091
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1092
            public boolean compatible(Type found, Type req, Warner warn) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1093
                if (allowFunctionalInterfaceMostSpecific &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1094
                        unrelatedFunctionalInterfaces(found, req) &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1095
                        (actual != null && actual.getTag() == DEFERRED)) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1096
                    DeferredType dt = (DeferredType) actual;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1097
                    DeferredType.SpeculativeCache.Entry e =
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1098
                            dt.speculativeCache.get(deferredAttrContext.msym, deferredAttrContext.phase);
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1099
                    if (e != null && e.speculativeTree != deferredAttr.stuckTree) {
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1100
                        return functionalInterfaceMostSpecific(found, req, e.speculativeTree);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1101
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1102
                }
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1103
                return compatibleBySubtyping(found, req);
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1104
            }
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1105
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1106
            private boolean compatibleBySubtyping(Type found, Type req) {
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1107
                if (!strict && found.isPrimitive() != req.isPrimitive()) {
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1108
                    found = found.isPrimitive() ? types.boxedClass(found).type : types.unboxedType(found);
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1109
                }
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1110
                return types.isSubtypeNoCapture(found, deferredAttrContext.inferenceContext.asUndetVar(req));
15374
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
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1113
            /** Whether {@code t} and {@code s} are unrelated functional interface types. */
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1114
            private boolean unrelatedFunctionalInterfaces(Type t, Type s) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1115
                return types.isFunctionalInterface(t.tsym) &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1116
                       types.isFunctionalInterface(s.tsym) &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1117
                       types.asSuper(t, s.tsym) == null &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1118
                       types.asSuper(s, t.tsym) == null;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1119
            }
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1120
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1121
            /** Parameters {@code t} and {@code s} are unrelated functional interface types. */
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1122
            private boolean functionalInterfaceMostSpecific(Type t, Type s, JCTree tree) {
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1123
                FunctionalInterfaceMostSpecificChecker msc = new FunctionalInterfaceMostSpecificChecker(t, s);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1124
                msc.scan(tree);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1125
                return msc.result;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1126
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1127
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1128
            /**
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1129
             * Tests whether one functional interface type can be considered more specific
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1130
             * than another unrelated functional interface type for the scanned expression.
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1131
             */
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1132
            class FunctionalInterfaceMostSpecificChecker extends DeferredAttr.PolyScanner {
15374
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
                final Type t;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1135
                final Type s;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1136
                boolean result;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1137
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1138
                /** Parameters {@code t} and {@code s} are unrelated functional interface types. */
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1139
                FunctionalInterfaceMostSpecificChecker(Type t, Type s) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1140
                    this.t = t;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1141
                    this.s = s;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1142
                    result = true;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1143
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1144
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1145
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1146
                void skip(JCTree tree) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1147
                    result &= false;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1148
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1149
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1150
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1151
                public void visitConditional(JCConditional tree) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1152
                    scan(tree.truepart);
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1153
                    scan(tree.falsepart);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1154
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1155
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1156
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1157
                public void visitReference(JCMemberReference tree) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1158
                    Type desc_t = types.findDescriptorType(t);
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1159
                    Type desc_s = types.findDescriptorType(s);
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1160
                    // use inference variables here for more-specific inference (18.5.4)
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1161
                    if (!types.isSameTypes(desc_t.getParameterTypes(),
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1162
                            inferenceContext().asUndetVars(desc_s.getParameterTypes()))) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1163
                        result &= false;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1164
                    } else {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1165
                        // compare return types
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1166
                        Type ret_t = desc_t.getReturnType();
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1167
                        Type ret_s = desc_s.getReturnType();
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1168
                        if (ret_s.hasTag(VOID)) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1169
                            result &= true;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1170
                        } else if (ret_t.hasTag(VOID)) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1171
                            result &= false;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1172
                        } else if (ret_t.isPrimitive() != ret_s.isPrimitive()) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1173
                            boolean retValIsPrimitive =
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1174
                                    tree.refPolyKind == PolyKind.STANDALONE &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1175
                                    tree.sym.type.getReturnType().isPrimitive();
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1176
                            result &= (retValIsPrimitive == ret_t.isPrimitive()) &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1177
                                      (retValIsPrimitive != ret_s.isPrimitive());
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1178
                        } else {
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1179
                            result &= compatibleBySubtyping(ret_t, ret_s);
15374
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
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1184
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1185
                public void visitLambda(JCLambda tree) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1186
                    Type desc_t = types.findDescriptorType(t);
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1187
                    Type desc_s = types.findDescriptorType(s);
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1188
                    // use inference variables here for more-specific inference (18.5.4)
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1189
                    if (!types.isSameTypes(desc_t.getParameterTypes(),
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1190
                            inferenceContext().asUndetVars(desc_s.getParameterTypes()))) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1191
                        result &= false;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1192
                    } else {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1193
                        // compare return types
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1194
                        Type ret_t = desc_t.getReturnType();
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1195
                        Type ret_s = desc_s.getReturnType();
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1196
                        if (ret_s.hasTag(VOID)) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1197
                            result &= true;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1198
                        } else if (ret_t.hasTag(VOID)) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1199
                            result &= false;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1200
                        } else if (unrelatedFunctionalInterfaces(ret_t, ret_s)) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1201
                            for (JCExpression expr : lambdaResults(tree)) {
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1202
                                result &= functionalInterfaceMostSpecific(ret_t, ret_s, expr);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1203
                            }
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1204
                        } else if (ret_t.isPrimitive() != ret_s.isPrimitive()) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1205
                            for (JCExpression expr : lambdaResults(tree)) {
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1206
                                boolean retValIsPrimitive = expr.isStandalone() && expr.type.isPrimitive();
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1207
                                result &= (retValIsPrimitive == ret_t.isPrimitive()) &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1208
                                          (retValIsPrimitive != ret_s.isPrimitive());
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1209
                            }
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1210
                        } else {
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1211
                            result &= compatibleBySubtyping(ret_t, ret_s);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1212
                        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1213
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1214
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1215
                //where
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1216
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1217
                private List<JCExpression> lambdaResults(JCLambda lambda) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1218
                    if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1219
                        return List.of((JCExpression) lambda.body);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1220
                    } else {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1221
                        final ListBuffer<JCExpression> buffer = new ListBuffer<>();
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1222
                        DeferredAttr.LambdaReturnScanner lambdaScanner =
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1223
                                new DeferredAttr.LambdaReturnScanner() {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1224
                                    @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1225
                                    public void visitReturn(JCReturn tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1226
                                        if (tree.expr != null) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1227
                                            buffer.append(tree.expr);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1228
                                        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1229
                                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1230
                                };
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1231
                        lambdaScanner.scan(lambda.body);
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1232
                        return buffer.toList();
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1233
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1234
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1235
            }
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1236
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1237
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1238
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1239
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1240
            Assert.error("Cannot get here!");
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1241
            return null;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1242
        }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1243
    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1244
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1245
    public static class InapplicableMethodException extends RuntimeException {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1246
        private static final long serialVersionUID = 0;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1247
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1248
        JCDiagnostic diagnostic;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1249
        JCDiagnostic.Factory diags;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1250
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1251
        InapplicableMethodException(JCDiagnostic.Factory diags) {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1252
            this.diagnostic = null;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1253
            this.diags = diags;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1254
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1255
        InapplicableMethodException setMessage() {
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1256
            return setMessage((JCDiagnostic)null);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1257
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1258
        InapplicableMethodException setMessage(String key) {
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1259
            return setMessage(key != null ? diags.fragment(key) : null);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1260
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1261
        InapplicableMethodException setMessage(String key, Object... args) {
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1262
            return setMessage(key != null ? diags.fragment(key, args) : null);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1263
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1264
        InapplicableMethodException setMessage(JCDiagnostic diag) {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1265
            this.diagnostic = diag;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1266
            return this;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1267
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1268
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1269
        public JCDiagnostic getDiagnostic() {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1270
            return diagnostic;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1271
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1272
    }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1273
    private final InapplicableMethodException inapplicableMethodException;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1274
06bc494ca11e Initial load
duke
parents:
diff changeset
  1275
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1276
 *  Symbol lookup
06bc494ca11e Initial load
duke
parents:
diff changeset
  1277
 *  the following naming conventions for arguments are used
06bc494ca11e Initial load
duke
parents:
diff changeset
  1278
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1279
 *       env      is the environment where the symbol was mentioned
06bc494ca11e Initial load
duke
parents:
diff changeset
  1280
 *       site     is the type of which the symbol is a member
06bc494ca11e Initial load
duke
parents:
diff changeset
  1281
 *       name     is the symbol's name
06bc494ca11e Initial load
duke
parents:
diff changeset
  1282
 *                if no arguments are given
06bc494ca11e Initial load
duke
parents:
diff changeset
  1283
 *       argtypes are the value arguments, if we search for a method
06bc494ca11e Initial load
duke
parents:
diff changeset
  1284
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1285
 *  If no symbol was found, a ResolveError detailing the problem is returned.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1286
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1287
06bc494ca11e Initial load
duke
parents:
diff changeset
  1288
    /** Find field. Synthetic fields are always skipped.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1289
     *  @param env     The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1290
     *  @param site    The original type from where the selection takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1291
     *  @param name    The name of the field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1292
     *  @param c       The class to search for the field. This is always
06bc494ca11e Initial load
duke
parents:
diff changeset
  1293
     *                 a superclass or implemented interface of site's class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1294
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1295
    Symbol findField(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1296
                     Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1297
                     Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1298
                     TypeSymbol c) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1299
        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
  1300
            c = c.type.getUpperBound().tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1301
        Symbol bestSoFar = varNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1302
        Symbol sym;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1303
        for (Symbol s : c.members().getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1304
            if (s.kind == VAR && (s.flags_field & SYNTHETIC) == 0) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1305
                return isAccessible(env, site, s)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1306
                    ? s : new AccessError(env, site, s);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1307
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1308
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1309
        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
  1310
        if (st != null && (st.hasTag(CLASS) || st.hasTag(TYPEVAR))) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1311
            sym = findField(env, site, name, st.tsym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1312
            bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1313
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1314
        for (List<Type> l = types.interfaces(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1315
             bestSoFar.kind != AMBIGUOUS && l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1316
             l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1317
            sym = findField(env, site, name, l.head.tsym);
18378
00267721fe3a 6360970: javac erroneously accept ambiguous field reference
mcimadamore
parents: 17998
diff changeset
  1318
            if (bestSoFar.exists() && sym.exists() &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1319
                sym.owner != bestSoFar.owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1320
                bestSoFar = new AmbiguityError(bestSoFar, sym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1321
            else
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1322
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1323
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1324
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1325
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1326
06bc494ca11e Initial load
duke
parents:
diff changeset
  1327
    /** Resolve a field identifier, throw a fatal error if not found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1328
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1329
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1330
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  1331
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1332
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1333
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1334
    public VarSymbol resolveInternalField(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1335
                                          Type site, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1336
        Symbol sym = findField(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1337
        if (sym.kind == VAR) return (VarSymbol)sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1338
        else throw new FatalError(
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
  1339
                 diags.fragment("fatal.err.cant.locate.field",
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1340
                                name));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1341
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1342
06bc494ca11e Initial load
duke
parents:
diff changeset
  1343
    /** Find unqualified variable or field with given name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1344
     *  Synthetic fields always skipped.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1345
     *  @param env     The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1346
     *  @param name    The name of the variable or field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1347
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1348
    Symbol findVar(Env<AttrContext> env, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1349
        Symbol bestSoFar = varNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1350
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1351
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1352
        while (env1.outer != null) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1353
            Symbol sym = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1354
            if (isStatic(env1)) staticOnly = true;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1355
            for (Symbol s : env1.info.scope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1356
                if (s.kind == VAR && (s.flags_field & SYNTHETIC) == 0) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1357
                    sym = s;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1358
                    break;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1359
                }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1360
            }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1361
            if (sym == null) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1362
                sym = findField(env1, env1.enclClass.sym.type, name, env1.enclClass.sym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1363
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1364
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1365
                if (staticOnly &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1366
                    sym.kind == VAR &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1367
                    sym.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1368
                    (sym.flags() & STATIC) == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1369
                    return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1370
                else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1371
                    return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1372
            } else {
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1373
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1374
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1375
06bc494ca11e Initial load
duke
parents:
diff changeset
  1376
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1377
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1378
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1379
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1380
        Symbol sym = findField(env, syms.predefClass.type, name, syms.predefClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1381
        if (sym.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1382
            return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1383
        if (bestSoFar.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1384
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1385
19492
767d7330011f 6537020: JCK tests: a compile-time error should be given in case of ambiguously imported fields (types, methods)
mcimadamore
parents: 19129
diff changeset
  1386
        Symbol origin = null;
767d7330011f 6537020: JCK tests: a compile-time error should be given in case of ambiguously imported fields (types, methods)
mcimadamore
parents: 19129
diff changeset
  1387
        for (Scope sc : new Scope[] { env.toplevel.namedImportScope, env.toplevel.starImportScope }) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1388
            for (Symbol currentSymbol : sc.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1389
                if (currentSymbol.kind != VAR)
19492
767d7330011f 6537020: JCK tests: a compile-time error should be given in case of ambiguously imported fields (types, methods)
mcimadamore
parents: 19129
diff changeset
  1390
                    continue;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1391
                // invariant: sym.kind == Symbol.Kind.VAR
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1392
                if (!bestSoFar.kind.isResolutionError() &&
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1393
                    currentSymbol.owner != bestSoFar.owner)
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1394
                    return new AmbiguityError(bestSoFar, currentSymbol);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1395
                else if (!bestSoFar.kind.betterThan(VAR)) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1396
                    origin = sc.getOrigin(currentSymbol).owner;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1397
                    bestSoFar = isAccessible(env, origin.type, currentSymbol)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1398
                        ? currentSymbol : new AccessError(env, origin.type, currentSymbol);
19492
767d7330011f 6537020: JCK tests: a compile-time error should be given in case of ambiguously imported fields (types, methods)
mcimadamore
parents: 19129
diff changeset
  1399
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1400
            }
19492
767d7330011f 6537020: JCK tests: a compile-time error should be given in case of ambiguously imported fields (types, methods)
mcimadamore
parents: 19129
diff changeset
  1401
            if (bestSoFar.exists()) break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1402
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1403
        if (bestSoFar.kind == VAR && bestSoFar.owner.type != origin.type)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1404
            return bestSoFar.clone(origin);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1405
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1406
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1407
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1408
06bc494ca11e Initial load
duke
parents:
diff changeset
  1409
    Warner noteWarner = new Warner();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1410
06bc494ca11e Initial load
duke
parents:
diff changeset
  1411
    /** Select the best method for a call site among two choices.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1412
     *  @param env              The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1413
     *  @param site             The original type from where the
06bc494ca11e Initial load
duke
parents:
diff changeset
  1414
     *                          selection takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1415
     *  @param argtypes         The invocation's value arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1416
     *  @param typeargtypes     The invocation's type arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1417
     *  @param sym              Proposed new best match.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1418
     *  @param bestSoFar        Previously found best match.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1419
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1420
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1421
     */
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1422
    @SuppressWarnings("fallthrough")
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1423
    Symbol selectBest(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1424
                      Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1425
                      List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1426
                      List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1427
                      Symbol sym,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1428
                      Symbol bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1429
                      boolean allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1430
                      boolean useVarargs) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1431
        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
  1432
                !sym.isInheritedIn(site.tsym, types)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1433
            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
  1434
        } else if (useVarargs && (sym.flags() & VARARGS) == 0) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1435
            return bestSoFar.kind.isResolutionError() ?
24400
f05df7f58567 8037379: fix for JDK-8029569 doesn't cover all possible cases
vromero
parents: 24396
diff changeset
  1436
                    new BadVarargsMethod((ResolveError)bestSoFar.baseSymbol()) :
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  1437
                    bestSoFar;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1438
        }
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1439
        Assert.check(!sym.kind.isResolutionError());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1440
        try {
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
  1441
            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
  1442
                               allowBoxing, useVarargs, types.noWarnings);
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1443
            currentResolutionContext.addApplicableCandidate(sym, mt);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1444
        } catch (InapplicableMethodException ex) {
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1445
            currentResolutionContext.addInapplicableCandidate(sym, ex.getDiagnostic());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1446
            switch (bestSoFar.kind) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1447
                case ABSENT_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1448
                    return new InapplicableSymbolError(currentResolutionContext);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1449
                case WRONG_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1450
                    bestSoFar = new InapplicableSymbolsError(currentResolutionContext);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1451
                default:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1452
                    return bestSoFar;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1453
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1454
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1455
        if (!isAccessible(env, site, sym)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1456
            return (bestSoFar.kind == ABSENT_MTH)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1457
                ? new AccessError(env, site, sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1458
                : bestSoFar;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  1459
        }
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1460
        return (bestSoFar.kind.isResolutionError() && bestSoFar.kind != AMBIGUOUS)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1461
            ? sym
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1462
            : mostSpecific(argtypes, sym, bestSoFar, env, site, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1463
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1464
06bc494ca11e Initial load
duke
parents:
diff changeset
  1465
    /* Return the most specific of the two methods for a call,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1466
     *  given that both are accessible and applicable.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1467
     *  @param m1               A new candidate for most specific.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1468
     *  @param m2               The previous most specific candidate.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1469
     *  @param env              The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1470
     *  @param site             The original type from where the selection
06bc494ca11e Initial load
duke
parents:
diff changeset
  1471
     *                          takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1472
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1473
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1474
     */
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1475
    Symbol mostSpecific(List<Type> argtypes, Symbol m1,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1476
                        Symbol m2,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1477
                        Env<AttrContext> env,
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
  1478
                        final Type site,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1479
                        boolean useVarargs) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1480
        switch (m2.kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1481
        case MTH:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1482
            if (m1 == m2) return m1;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1483
            boolean m1SignatureMoreSpecific =
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1484
                    signatureMoreSpecific(argtypes, env, site, m1, m2, useVarargs);
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1485
            boolean m2SignatureMoreSpecific =
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1486
                    signatureMoreSpecific(argtypes, env, site, m2, m1, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1487
            if (m1SignatureMoreSpecific && m2SignatureMoreSpecific) {
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1488
                Type mt1 = types.memberType(site, m1);
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1489
                Type mt2 = types.memberType(site, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1490
                if (!types.overrideEquivalent(mt1, mt2))
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1491
                    return ambiguityError(m1, m2);
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1492
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1493
                // same signature; select (a) the non-bridge method, or
06bc494ca11e Initial load
duke
parents:
diff changeset
  1494
                // (b) the one that overrides the other, or (c) the concrete
06bc494ca11e Initial load
duke
parents:
diff changeset
  1495
                // 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
  1496
                if ((m1.flags() & BRIDGE) != (m2.flags() & BRIDGE))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1497
                    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
  1498
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1499
                // if one overrides or hides the other, use it
06bc494ca11e Initial load
duke
parents:
diff changeset
  1500
                TypeSymbol m1Owner = (TypeSymbol)m1.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1501
                TypeSymbol m2Owner = (TypeSymbol)m2.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1502
                if (types.asSuper(m1Owner.type, m2Owner) != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1503
                    ((m1.owner.flags_field & INTERFACE) == 0 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  1504
                     (m2.owner.flags_field & INTERFACE) != 0) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1505
                    m1.overrides(m2, m1Owner, types, false))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1506
                    return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1507
                if (types.asSuper(m2Owner.type, m1Owner) != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1508
                    ((m2.owner.flags_field & INTERFACE) == 0 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  1509
                     (m1.owner.flags_field & INTERFACE) != 0) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1510
                    m2.overrides(m1, m2Owner, types, false))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1511
                    return m2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1512
                boolean m1Abstract = (m1.flags() & ABSTRACT) != 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1513
                boolean m2Abstract = (m2.flags() & ABSTRACT) != 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1514
                if (m1Abstract && !m2Abstract) return m2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1515
                if (m2Abstract && !m1Abstract) return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1516
                // both abstract or both concrete
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1517
                return ambiguityError(m1, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1518
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1519
            if (m1SignatureMoreSpecific) return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1520
            if (m2SignatureMoreSpecific) return m2;
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1521
            return ambiguityError(m1, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1522
        case AMBIGUOUS:
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1523
            //compare m1 to ambiguous methods in m2
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  1524
            AmbiguityError e = (AmbiguityError)m2.baseSymbol();
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1525
            boolean m1MoreSpecificThanAnyAmbiguous = true;
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1526
            boolean allAmbiguousMoreSpecificThanM1 = true;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1527
            for (Symbol s : e.ambiguousSyms) {
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1528
                Symbol moreSpecific = mostSpecific(argtypes, m1, s, env, site, useVarargs);
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1529
                m1MoreSpecificThanAnyAmbiguous &= moreSpecific == m1;
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1530
                allAmbiguousMoreSpecificThanM1 &= moreSpecific == s;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1531
            }
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1532
            if (m1MoreSpecificThanAnyAmbiguous)
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1533
                return m1;
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1534
            //if m1 is more specific than some ambiguous methods, but other ambiguous methods are
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1535
            //more specific than m1, add it as a new ambiguous method:
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1536
            if (!allAmbiguousMoreSpecificThanM1)
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1537
                e.addAmbiguousSymbol(m1);
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1538
            return e;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1539
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1540
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1541
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1542
    }
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1543
    //where
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1544
    private boolean signatureMoreSpecific(List<Type> actuals, Env<AttrContext> env, Type site, Symbol m1, Symbol m2, boolean useVarargs) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1545
        noteWarner.clear();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1546
        int maxLength = Math.max(
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1547
                            Math.max(m1.type.getParameterTypes().length(), actuals.length()),
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1548
                            m2.type.getParameterTypes().length());
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1549
        MethodResolutionContext prevResolutionContext = currentResolutionContext;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1550
        try {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1551
            currentResolutionContext = new MethodResolutionContext();
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1552
            currentResolutionContext.step = prevResolutionContext.step;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1553
            currentResolutionContext.methodCheck =
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1554
                    prevResolutionContext.methodCheck.mostSpecificCheck(actuals);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1555
            Type mst = instantiate(env, site, m2, null,
24293
0d889f759fac 8033718: Inference ignores capture variable as upper bound
dlsmith
parents: 24226
diff changeset
  1556
                    adjustArgs(types.cvarLowerBounds(types.memberType(site, m1).getParameterTypes()), m1, maxLength, useVarargs), null,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1557
                    false, useVarargs, noteWarner);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1558
            return mst != null &&
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1559
                    !noteWarner.hasLint(Lint.LintCategory.UNCHECKED);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1560
        } finally {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1561
            currentResolutionContext = prevResolutionContext;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1562
        }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1563
    }
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  1564
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  1565
    List<Type> adjustArgs(List<Type> args, Symbol msym, int length, boolean allowVarargs) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1566
        if ((msym.flags() & VARARGS) != 0 && allowVarargs) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1567
            Type varargsElem = types.elemtype(args.last());
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1568
            if (varargsElem == null) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1569
                Assert.error("Bad varargs = " + args.last() + " " + msym);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1570
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1571
            List<Type> newArgs = args.reverse().tail.prepend(varargsElem).reverse();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1572
            while (newArgs.length() < length) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1573
                newArgs = newArgs.append(newArgs.last());
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1574
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1575
            return newArgs;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1576
        } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1577
            return args;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1578
        }
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1579
    }
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1580
    //where
10197
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1581
    Type mostSpecificReturnType(Type mt1, Type mt2) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1582
        Type rt1 = mt1.getReturnType();
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1583
        Type rt2 = mt2.getReturnType();
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1584
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1585
        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
  1586
            //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
  1587
            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
  1588
        }
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1589
        //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
  1590
        if (types.isSubtype(rt1, rt2)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1591
            return mt1;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1592
        } else if (types.isSubtype(rt2, rt1)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1593
            return mt2;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1594
        } else if (types.returnTypeSubstitutable(mt1, mt2)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1595
            return mt1;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1596
        } else if (types.returnTypeSubstitutable(mt2, mt1)) {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1597
            return mt2;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1598
        } else {
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1599
            return null;
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1600
        }
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1601
    }
28afe0fb34c8 7062745: Regression: difference in overload resolution when two methods are maximally specific
mcimadamore
parents: 9720
diff changeset
  1602
    //where
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1603
    Symbol ambiguityError(Symbol m1, Symbol m2) {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1604
        if (((m1.flags() | m2.flags()) & CLASH) != 0) {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1605
            return (m1.flags() & CLASH) == 0 ? m1 : m2;
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1606
        } else {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1607
            return new AmbiguityError(m1, m2);
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1608
        }
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1609
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1610
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1611
    Symbol findMethodInScope(Env<AttrContext> env,
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1612
            Type site,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1613
            Name name,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1614
            List<Type> argtypes,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1615
            List<Type> typeargtypes,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1616
            Scope sc,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1617
            Symbol bestSoFar,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1618
            boolean allowBoxing,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1619
            boolean useVarargs,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1620
            boolean abstractok) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1621
        for (Symbol s : sc.getSymbolsByName(name, new LookupFilter(abstractok))) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1622
            bestSoFar = selectBest(env, site, argtypes, typeargtypes, s,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1623
                    bestSoFar, allowBoxing, useVarargs);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1624
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1625
        return bestSoFar;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1626
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1627
    //where
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1628
        class LookupFilter implements Filter<Symbol> {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1629
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1630
            boolean abstractOk;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1631
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1632
            LookupFilter(boolean abstractOk) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1633
                this.abstractOk = abstractOk;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1634
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1635
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1636
            public boolean accepts(Symbol s) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1637
                long flags = s.flags();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1638
                return s.kind == MTH &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1639
                        (flags & SYNTHETIC) == 0 &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1640
                        (abstractOk ||
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1641
                        (flags & DEFAULT) != 0 ||
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1642
                        (flags & ABSTRACT) == 0);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1643
            }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  1644
        }
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1645
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1646
    /** Find best qualified method matching given name, type and value
06bc494ca11e Initial load
duke
parents:
diff changeset
  1647
     *  arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1648
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1649
     *  @param site      The original type from where the selection
06bc494ca11e Initial load
duke
parents:
diff changeset
  1650
     *                   takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1651
     *  @param name      The method's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1652
     *  @param argtypes  The method's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1653
     *  @param typeargtypes The method's type arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
  1654
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1655
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1656
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1657
    Symbol findMethod(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1658
                      Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1659
                      Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1660
                      List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1661
                      List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1662
                      boolean allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1663
                      boolean useVarargs) {
5736
ee0850472ca1 6939134: JSR 292 adjustments to method handle invocation
jrose
parents: 5321
diff changeset
  1664
        Symbol bestSoFar = methodNotFound;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  1665
        bestSoFar = findMethod(env,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1666
                          site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1667
                          name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1668
                          argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1669
                          typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1670
                          site.tsym.type,
5736
ee0850472ca1 6939134: JSR 292 adjustments to method handle invocation
jrose
parents: 5321
diff changeset
  1671
                          bestSoFar,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1672
                          allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1673
                          useVarargs);
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  1674
        return bestSoFar;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1675
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1676
    // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  1677
    private Symbol findMethod(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1678
                              Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1679
                              Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1680
                              List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1681
                              List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1682
                              Type intype,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1683
                              Symbol bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1684
                              boolean allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1685
                              boolean useVarargs) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1686
        @SuppressWarnings({"unchecked","rawtypes"})
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1687
        List<Type>[] itypes = (List<Type>[])new List[] { List.<Type>nil(), List.<Type>nil() };
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1688
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1689
        InterfaceLookupPhase iphase = InterfaceLookupPhase.ABSTRACT_OK;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1690
        for (TypeSymbol s : superclasses(intype)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1691
            bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1692
                    s.members(), bestSoFar, allowBoxing, useVarargs, true);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1693
            if (name == names.init) return bestSoFar;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1694
            iphase = (iphase == null) ? null : iphase.update(s, this);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1695
            if (iphase != null) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1696
                for (Type itype : types.interfaces(s.type)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1697
                    itypes[iphase.ordinal()] = types.union(types.closure(itype), itypes[iphase.ordinal()]);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1698
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1699
            }
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1700
        }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1701
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1702
        Symbol concrete = bestSoFar.kind.isValid() &&
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1703
                (bestSoFar.flags() & ABSTRACT) == 0 ?
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1704
                bestSoFar : methodNotFound;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1705
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1706
        for (InterfaceLookupPhase iphase2 : InterfaceLookupPhase.values()) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1707
            //keep searching for abstract methods
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1708
            for (Type itype : itypes[iphase2.ordinal()]) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1709
                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
  1710
                if (iphase2 == InterfaceLookupPhase.DEFAULT_OK &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1711
                        (itype.tsym.flags() & DEFAULT) == 0) continue;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1712
                bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1713
                        itype.tsym.members(), bestSoFar, allowBoxing, useVarargs, true);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1714
                if (concrete != bestSoFar &&
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1715
                    concrete.kind.isValid() &&
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1716
                    bestSoFar.kind.isValid() &&
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1717
                        types.isSubSignature(concrete.type, bestSoFar.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1718
                    //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
  1719
                    //most specific ends up comparing abstract methods that might have
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1720
                    //been implemented by some concrete method in a subclass and,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1721
                    //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
  1722
                    //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
  1723
                    //to explicitly call that out (see CR 6178365)
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1724
                    bestSoFar = concrete;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1725
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1726
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1727
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1728
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1729
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1730
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1731
    enum InterfaceLookupPhase {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1732
        ABSTRACT_OK() {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1733
            @Override
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1734
            InterfaceLookupPhase update(Symbol s, Resolve rs) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1735
                //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
  1736
                //(as concrete classes are expected to implement all abstracts coming
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1737
                //from superinterfaces)
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1738
                if ((s.flags() & (ABSTRACT | INTERFACE | ENUM)) != 0) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1739
                    return this;
23105
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  1740
                } else {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1741
                    return DEFAULT_OK;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1742
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1743
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1744
        },
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1745
        DEFAULT_OK() {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1746
            @Override
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1747
            InterfaceLookupPhase update(Symbol s, Resolve rs) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1748
                return this;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1749
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1750
        };
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1751
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1752
        abstract InterfaceLookupPhase update(Symbol s, Resolve rs);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1753
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1754
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1755
    /**
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1756
     * Return an Iterable object to scan the superclasses of a given type.
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1757
     * 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
  1758
     * access more supertypes than strictly needed (as this could trigger completion
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1759
     * errors if some of the not-needed supertypes are missing/ill-formed).
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1760
     */
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1761
    Iterable<TypeSymbol> superclasses(final Type intype) {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1762
        return new Iterable<TypeSymbol>() {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1763
            public Iterator<TypeSymbol> iterator() {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1764
                return new Iterator<TypeSymbol>() {
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1765
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1766
                    List<TypeSymbol> seen = List.nil();
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1767
                    TypeSymbol currentSym = symbolFor(intype);
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1768
                    TypeSymbol prevSym = null;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1769
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1770
                    public boolean hasNext() {
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1771
                        if (currentSym == syms.noSymbol) {
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1772
                            currentSym = symbolFor(types.supertype(prevSym.type));
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1773
                        }
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1774
                        return currentSym != null;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1775
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1776
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1777
                    public TypeSymbol next() {
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1778
                        prevSym = currentSym;
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1779
                        currentSym = syms.noSymbol;
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1780
                        Assert.check(prevSym != null || prevSym != syms.noSymbol);
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1781
                        return prevSym;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1782
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1783
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1784
                    public void remove() {
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1785
                        throw new UnsupportedOperationException();
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1786
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1787
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1788
                    TypeSymbol symbolFor(Type t) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1789
                        if (!t.hasTag(CLASS) &&
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1790
                                !t.hasTag(TYPEVAR)) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1791
                            return null;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1792
                        }
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  1793
                        t = types.skipTypeVars(t, false);
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1794
                        if (seen.contains(t.tsym)) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1795
                            //degenerate case in which we have a circular
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1796
                            //class hierarchy - because of ill-formed classfiles
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1797
                            return null;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1798
                        }
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1799
                        seen = seen.prepend(t.tsym);
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
  1800
                        return t.tsym;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1801
                    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1802
                };
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1803
            }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1804
        };
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1805
    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1806
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1807
    /** Find unqualified method matching given name, type and value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1808
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1809
     *  @param name      The method's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1810
     *  @param argtypes  The method's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1811
     *  @param typeargtypes  The method's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1812
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1813
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1814
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1815
    Symbol findFun(Env<AttrContext> env, Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1816
                   List<Type> argtypes, List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1817
                   boolean allowBoxing, boolean useVarargs) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1818
        Symbol bestSoFar = methodNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1819
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1820
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1821
        while (env1.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1822
            if (isStatic(env1)) staticOnly = true;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1823
            Symbol sym = findMethod(
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1824
                env1, env1.enclClass.sym.type, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1825
                allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1826
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1827
                if (staticOnly &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1828
                    sym.kind == MTH &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1829
                    sym.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1830
                    (sym.flags() & STATIC) == 0) return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1831
                else return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1832
            } else {
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1833
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1834
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1835
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1836
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1837
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1838
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1839
        Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1840
                                typeargtypes, allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1841
        if (sym.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1842
            return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1843
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1844
        for (Symbol currentSym : env.toplevel.namedImportScope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1845
            Symbol origin = env.toplevel.namedImportScope.getOrigin(currentSym).owner;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1846
            if (currentSym.kind == MTH) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1847
                if (currentSym.owner.type != origin.type)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1848
                    currentSym = currentSym.clone(origin);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1849
                if (!isAccessible(env, origin.type, currentSym))
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1850
                    currentSym = new AccessError(env, origin.type, currentSym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1851
                bestSoFar = selectBest(env, origin.type,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1852
                                       argtypes, typeargtypes,
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1853
                                       currentSym, bestSoFar,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1854
                                       allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1855
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1856
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1857
        if (bestSoFar.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1858
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1859
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1860
        for (Symbol currentSym : env.toplevel.starImportScope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1861
            Symbol origin = env.toplevel.starImportScope.getOrigin(currentSym).owner;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1862
            if (currentSym.kind == MTH) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1863
                if (currentSym.owner.type != origin.type)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1864
                    currentSym = currentSym.clone(origin);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1865
                if (!isAccessible(env, origin.type, currentSym))
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1866
                    currentSym = new AccessError(env, origin.type, currentSym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1867
                bestSoFar = selectBest(env, origin.type,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1868
                                       argtypes, typeargtypes,
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1869
                                       currentSym, bestSoFar,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1870
                                       allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1871
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1872
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1873
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1874
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1875
06bc494ca11e Initial load
duke
parents:
diff changeset
  1876
    /** Load toplevel or member class with given fully qualified name and
06bc494ca11e Initial load
duke
parents:
diff changeset
  1877
     *  verify that it is accessible.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1878
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1879
     *  @param name      The fully qualified name of the class to be loaded.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1880
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1881
    Symbol loadClass(Env<AttrContext> env, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1882
        try {
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24404
diff changeset
  1883
            ClassSymbol c = finder.loadClass(name);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1884
            return isAccessible(env, c) ? c : new AccessError(c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24404
diff changeset
  1885
        } catch (ClassFinder.BadClassFile err) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1886
            throw err;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1887
        } catch (CompletionFailure ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1888
            return typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1889
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1890
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1891
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1892
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1893
    /**
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1894
     * Find a type declared in a scope (not inherited).  Return null
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1895
     * if none is found.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1896
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1897
     *  @param site      The original type from where the selection takes
06bc494ca11e Initial load
duke
parents:
diff changeset
  1898
     *                   place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1899
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1900
     *  @param c         The class to search for the member type. This is
06bc494ca11e Initial load
duke
parents:
diff changeset
  1901
     *                   always a superclass or implemented interface of
06bc494ca11e Initial load
duke
parents:
diff changeset
  1902
     *                   site's class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1903
     */
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1904
    Symbol findImmediateMemberType(Env<AttrContext> env,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1905
                                   Type site,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1906
                                   Name name,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1907
                                   TypeSymbol c) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1908
        for (Symbol sym : c.members().getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1909
            if (sym.kind == TYP) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1910
                return isAccessible(env, site, sym)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1911
                    ? sym
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1912
                    : new AccessError(env, site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1913
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1914
        }
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1915
        return typeNotFound;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1916
    }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1917
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1918
    /** Find a member type inherited from a superclass or interface.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1919
     *  @param env       The current environment.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1920
     *  @param site      The original type from where the selection takes
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1921
     *                   place.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1922
     *  @param name      The type's name.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1923
     *  @param c         The class to search for the member type. This is
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1924
     *                   always a superclass or implemented interface of
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1925
     *                   site's class.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1926
     */
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1927
    Symbol findInheritedMemberType(Env<AttrContext> env,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1928
                                   Type site,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1929
                                   Name name,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1930
                                   TypeSymbol c) {
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1931
        Symbol bestSoFar = typeNotFound;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1932
        Symbol sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1933
        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
  1934
        if (st != null && st.hasTag(CLASS)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1935
            sym = findMemberType(env, site, name, st.tsym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1936
            bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1937
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1938
        for (List<Type> l = types.interfaces(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1939
             bestSoFar.kind != AMBIGUOUS && l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1940
             l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1941
            sym = findMemberType(env, site, name, l.head.tsym);
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1942
            if (!bestSoFar.kind.isResolutionError() &&
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1943
                !sym.kind.isResolutionError() &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1944
                sym.owner != bestSoFar.owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1945
                bestSoFar = new AmbiguityError(bestSoFar, sym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1946
            else
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1947
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1948
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1949
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1950
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1951
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1952
    /** Find qualified member type.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1953
     *  @param env       The current environment.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1954
     *  @param site      The original type from where the selection takes
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1955
     *                   place.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1956
     *  @param name      The type's name.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1957
     *  @param c         The class to search for the member type. This is
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1958
     *                   always a superclass or implemented interface of
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1959
     *                   site's class.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1960
     */
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1961
    Symbol findMemberType(Env<AttrContext> env,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1962
                          Type site,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1963
                          Name name,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1964
                          TypeSymbol c) {
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1965
        Symbol sym = findImmediateMemberType(env, site, name, c);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1966
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1967
        if (sym != typeNotFound)
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1968
            return sym;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1969
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1970
        return findInheritedMemberType(env, site, name, c);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1971
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1972
    }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1973
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1974
    /** Find a global type in given scope and load corresponding class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1975
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1976
     *  @param scope     The scope in which to look for the type.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1977
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1978
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1979
    Symbol findGlobalType(Env<AttrContext> env, Scope scope, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1980
        Symbol bestSoFar = typeNotFound;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1981
        for (Symbol s : scope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1982
            Symbol sym = loadClass(env, s.flatName());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1983
            if (bestSoFar.kind == TYP && sym.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1984
                bestSoFar != sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1985
                return new AmbiguityError(bestSoFar, sym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1986
            else
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1987
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1988
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1989
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1990
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1991
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1992
    Symbol findTypeVar(Env<AttrContext> env, Name name, boolean staticOnly) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1993
        for (Symbol sym : env.info.scope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1994
            if (sym.kind == TYP) {
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  1995
                if (staticOnly &&
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1996
                    sym.type.hasTag(TYPEVAR) &&
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1997
                    sym.owner.kind == TYP)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1998
                    return new StaticError(sym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1999
                return sym;
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2000
            }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2001
        }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2002
        return typeNotFound;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2003
    }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2004
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2005
    /** Find an unqualified type symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2006
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2007
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2008
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2009
    Symbol findType(Env<AttrContext> env, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2010
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2011
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2012
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2013
        for (Env<AttrContext> env1 = env; env1.outer != null; env1 = env1.outer) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2014
            if (isStatic(env1)) staticOnly = true;
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2015
            // First, look for a type variable and the first member type
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2016
            final Symbol tyvar = findTypeVar(env1, name, staticOnly);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2017
            sym = findImmediateMemberType(env1, env1.enclClass.sym.type,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2018
                                          name, env1.enclClass.sym);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2019
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2020
            // Return the type variable if we have it, and have no
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2021
            // immediate member, OR the type variable is for a method.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2022
            if (tyvar != typeNotFound) {
27386
784414cffd9a 8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents: 27224
diff changeset
  2023
                if (env.baseClause || sym == typeNotFound ||
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2024
                    (tyvar.kind == TYP && tyvar.exists() &&
27386
784414cffd9a 8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents: 27224
diff changeset
  2025
                     tyvar.owner.kind == MTH)) {
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2026
                    return tyvar;
27386
784414cffd9a 8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents: 27224
diff changeset
  2027
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2028
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2029
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2030
            // If the environment is a class def, finish up,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2031
            // otherwise, do the entire findMemberType
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2032
            if (sym == typeNotFound)
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2033
                sym = findInheritedMemberType(env1, env1.enclClass.sym.type,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2034
                                              name, env1.enclClass.sym);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2035
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2036
            if (staticOnly && sym.kind == TYP &&
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  2037
                sym.type.hasTag(CLASS) &&
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  2038
                sym.type.getEnclosingType().hasTag(CLASS) &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2039
                env1.enclClass.sym.type.isParameterized() &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2040
                sym.type.getEnclosingType().isParameterized())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2041
                return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2042
            else if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2043
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2044
06bc494ca11e Initial load
duke
parents:
diff changeset
  2045
            JCClassDecl encl = env1.baseClause ? (JCClassDecl)env1.tree : env1.enclClass;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2046
            if ((encl.sym.flags() & STATIC) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2047
                staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2048
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2049
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
  2050
        if (!env.tree.hasTag(IMPORT)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2051
            sym = findGlobalType(env, env.toplevel.namedImportScope, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2052
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2053
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2054
06bc494ca11e Initial load
duke
parents:
diff changeset
  2055
            sym = findGlobalType(env, env.toplevel.packge.members(), name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2056
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2057
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2058
06bc494ca11e Initial load
duke
parents:
diff changeset
  2059
            sym = findGlobalType(env, env.toplevel.starImportScope, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2060
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2061
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2062
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2063
06bc494ca11e Initial load
duke
parents:
diff changeset
  2064
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2065
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2066
06bc494ca11e Initial load
duke
parents:
diff changeset
  2067
    /** Find an unqualified identifier which matches a specified kind set.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2068
     *  @param env       The current environment.
14541
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14446
diff changeset
  2069
     *  @param name      The identifier's name.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2070
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2071
     *                   (a subset of VAL, TYP, PCK).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2072
     */
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2073
    Symbol findIdent(Env<AttrContext> env, Name name, KindSelector kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2074
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2075
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2076
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2077
        if (kind.contains(KindSelector.VAL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2078
            sym = findVar(env, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2079
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2080
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2081
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2082
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2083
        if (kind.contains(KindSelector.TYP)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2084
            sym = findType(env, name);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2085
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2086
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2087
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2088
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2089
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2090
        if (kind.contains(KindSelector.PCK))
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2091
            return syms.enterPackage(name);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2092
        else return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2093
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2094
06bc494ca11e Initial load
duke
parents:
diff changeset
  2095
    /** Find an identifier in a package which matches a specified kind set.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2096
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2097
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2098
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2099
     *                   (a nonempty subset of TYP, PCK).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2100
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2101
    Symbol findIdentInPackage(Env<AttrContext> env, TypeSymbol pck,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2102
                              Name name, KindSelector kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2103
        Name fullname = TypeSymbol.formFullName(name, pck);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2104
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2105
        PackageSymbol pack = null;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2106
        if (kind.contains(KindSelector.PCK)) {
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22440
diff changeset
  2107
            pack = syms.enterPackage(fullname);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2108
            if (pack.exists()) return pack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2109
        }
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2110
        if (kind.contains(KindSelector.TYP)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2111
            Symbol sym = loadClass(env, fullname);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2112
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2113
                // don't allow programs to use flatnames
06bc494ca11e Initial load
duke
parents:
diff changeset
  2114
                if (name == sym.name) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2115
            }
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2116
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2117
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2118
        return (pack != null) ? pack : bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2119
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2120
06bc494ca11e Initial load
duke
parents:
diff changeset
  2121
    /** Find an identifier among the members of a given type `site'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2122
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2123
     *  @param site      The type containing the symbol to be found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2124
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2125
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2126
     *                   (a subset of VAL, TYP).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2127
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2128
    Symbol findIdentInType(Env<AttrContext> env, Type site,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2129
                           Name name, KindSelector kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2130
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2131
        Symbol sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2132
        if (kind.contains(KindSelector.VAL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2133
            sym = findField(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2134
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2135
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2136
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2137
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2138
        if (kind.contains(KindSelector.TYP)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2139
            sym = findMemberType(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2140
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2141
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2142
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2143
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2144
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2145
06bc494ca11e Initial load
duke
parents:
diff changeset
  2146
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2147
 *  Access checking
06bc494ca11e Initial load
duke
parents:
diff changeset
  2148
 *  The following methods convert ResolveErrors to ErrorSymbols, issuing
06bc494ca11e Initial load
duke
parents:
diff changeset
  2149
 *  an error message in the process
06bc494ca11e Initial load
duke
parents:
diff changeset
  2150
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2151
06bc494ca11e Initial load
duke
parents:
diff changeset
  2152
    /** If `sym' is a bad symbol: report error and return errSymbol
06bc494ca11e Initial load
duke
parents:
diff changeset
  2153
     *  else pass through unchanged,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2154
     *  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
  2155
     *  symbol {@literal (--> flyweight pattern)}. This improves performance since we
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2156
     *  expect misses to happen frequently.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2157
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  2158
     *  @param sym       The symbol that was found, or a ResolveError.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2159
     *  @param pos       The position to use for error reporting.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2160
     *  @param location  The symbol the served as a context for this lookup
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2161
     *  @param site      The original type from where the selection took place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2162
     *  @param name      The symbol's name.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2163
     *  @param qualified Did we get here through a qualified expression resolution?
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2164
     *  @param argtypes  The invocation's value arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2165
     *                   if we looked for a method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2166
     *  @param typeargtypes  The invocation's type arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2167
     *                   if we looked for a method.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2168
     *  @param logResolveHelper helper class used to log resolve errors
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2169
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2170
    Symbol accessInternal(Symbol sym,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2171
                  DiagnosticPosition pos,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2172
                  Symbol location,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2173
                  Type site,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2174
                  Name name,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2175
                  boolean qualified,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2176
                  List<Type> argtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2177
                  List<Type> typeargtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2178
                  LogResolveHelper logResolveHelper) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  2179
        if (sym.kind.isResolutionError()) {
24400
f05df7f58567 8037379: fix for JDK-8029569 doesn't cover all possible cases
vromero
parents: 24396
diff changeset
  2180
            ResolveError errSym = (ResolveError)sym.baseSymbol();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2181
            sym = errSym.access(name, qualified ? site.tsym : syms.noSymbol);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2182
            argtypes = logResolveHelper.getArgumentTypes(errSym, sym, name, argtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2183
            if (logResolveHelper.resolveDiagnosticNeeded(site, argtypes, typeargtypes)) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2184
                logResolveError(errSym, pos, location, site, name, argtypes, typeargtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2185
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2186
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2187
        return sym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2188
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2189
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2190
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2191
     * 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
  2192
     * resolution diagnostics
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2193
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2194
    Symbol accessMethod(Symbol sym,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2195
                  DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2196
                  Symbol location,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2197
                  Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2198
                  Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2199
                  boolean qualified,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2200
                  List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2201
                  List<Type> typeargtypes) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2202
        return accessInternal(sym, pos, location, site, name, qualified, argtypes, typeargtypes, methodLogResolveHelper);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2203
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2204
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2205
    /** Same as original accessMethod(), but without location.
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2206
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2207
    Symbol accessMethod(Symbol sym,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2208
                  DiagnosticPosition pos,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2209
                  Type site,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2210
                  Name name,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2211
                  boolean qualified,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2212
                  List<Type> argtypes,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2213
                  List<Type> typeargtypes) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2214
        return accessMethod(sym, pos, site.tsym, site, name, qualified, argtypes, typeargtypes);
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2215
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2216
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2217
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2218
     * 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
  2219
     * type resolution diagnostics
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2220
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2221
    Symbol accessBase(Symbol sym,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2222
                  DiagnosticPosition pos,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2223
                  Symbol location,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2224
                  Type site,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2225
                  Name name,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2226
                  boolean qualified) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2227
        return accessInternal(sym, pos, location, site, name, qualified, List.<Type>nil(), null, basicLogResolveHelper);
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2228
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2229
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2230
    /** Same as original accessBase(), but without location.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2231
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2232
    Symbol accessBase(Symbol sym,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2233
                  DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2234
                  Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2235
                  Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2236
                  boolean qualified) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2237
        return accessBase(sym, pos, site.tsym, site, name, qualified);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2238
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2239
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2240
    interface LogResolveHelper {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2241
        boolean resolveDiagnosticNeeded(Type site, List<Type> argtypes, List<Type> typeargtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2242
        List<Type> getArgumentTypes(ResolveError errSym, Symbol accessedSym, Name name, List<Type> argtypes);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2243
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2244
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2245
    LogResolveHelper basicLogResolveHelper = new LogResolveHelper() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2246
        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
  2247
            return !site.isErroneous();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2248
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2249
        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
  2250
            return argtypes;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2251
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2252
    };
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2253
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2254
    LogResolveHelper methodLogResolveHelper = new LogResolveHelper() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2255
        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
  2256
            return !site.isErroneous() &&
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2257
                        !Type.isErroneous(argtypes) &&
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2258
                        (typeargtypes == null || !Type.isErroneous(typeargtypes));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2259
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2260
        public List<Type> getArgumentTypes(ResolveError errSym, Symbol accessedSym, Name name, List<Type> argtypes) {
29554
6d7957bd6866 8074100: Turn Type.Mapping into a true visitor
mcimadamore
parents: 29292
diff changeset
  2261
            return argtypes.map(new ResolveDeferredRecoveryMap(AttrMode.SPECULATIVE, accessedSym, currentResolutionContext.step));
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2262
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2263
    };
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2264
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2265
    class ResolveDeferredRecoveryMap extends DeferredAttr.RecoveryDeferredTypeMap {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2266
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2267
        public ResolveDeferredRecoveryMap(AttrMode mode, Symbol msym, MethodResolutionPhase step) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2268
            deferredAttr.super(mode, msym, step);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2269
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2270
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2271
        @Override
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2272
        protected Type typeOf(DeferredType dt) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2273
            Type res = super.typeOf(dt);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2274
            if (!res.isErroneous()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2275
                switch (TreeInfo.skipParens(dt.tree).getTag()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2276
                    case LAMBDA:
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2277
                    case REFERENCE:
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2278
                        return dt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2279
                    case CONDEXPR:
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2280
                        return res == Type.recoveryType ?
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2281
                                dt : res;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2282
                }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2283
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2284
            return res;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2285
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2286
    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2287
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2288
    /** Check that sym is not an abstract method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2289
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2290
    void checkNonAbstract(DiagnosticPosition pos, Symbol sym) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  2291
        if ((sym.flags() & ABSTRACT) != 0 && (sym.flags() & DEFAULT) == 0)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2292
            log.error(pos, "abstract.cant.be.accessed.directly",
06bc494ca11e Initial load
duke
parents:
diff changeset
  2293
                      kindName(sym), sym, sym.location());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2294
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2295
06bc494ca11e Initial load
duke
parents:
diff changeset
  2296
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2297
 *  Name resolution
06bc494ca11e Initial load
duke
parents:
diff changeset
  2298
 *  Naming conventions are as for symbol lookup
06bc494ca11e Initial load
duke
parents:
diff changeset
  2299
 *  Unlike the find... methods these methods will report access errors
06bc494ca11e Initial load
duke
parents:
diff changeset
  2300
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2301
06bc494ca11e Initial load
duke
parents:
diff changeset
  2302
    /** Resolve an unqualified (non-method) identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2303
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2304
     *  @param env       The environment current at the identifier use.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2305
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2306
     *  @param kind      The set of admissible symbol kinds for the identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2307
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2308
    Symbol resolveIdent(DiagnosticPosition pos, Env<AttrContext> env,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2309
                        Name name, KindSelector kind) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2310
        return accessBase(
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2311
            findIdent(env, name, kind),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2312
            pos, env.enclClass.sym.type, name, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2313
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2314
06bc494ca11e Initial load
duke
parents:
diff changeset
  2315
    /** Resolve an unqualified method identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2316
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2317
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2318
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2319
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2320
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2321
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2322
    Symbol resolveMethod(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2323
                         Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2324
                         Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2325
                         List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2326
                         List<Type> typeargtypes) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2327
        return lookupMethod(env, pos, env.enclClass.sym, resolveMethodCheck,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2328
                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
  2329
                    @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2330
                    Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2331
                        return findFun(env, name, argtypes, typeargtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2332
                                phase.isBoxingRequired(),
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2333
                                phase.isVarargsRequired());
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2334
                    }});
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  2335
    }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  2336
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2337
    /** Resolve a qualified method identifier
06bc494ca11e Initial load
duke
parents:
diff changeset
  2338
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2339
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2340
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  2341
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2342
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2343
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2344
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2345
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2346
    Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2347
                                  Type site, Name name, List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2348
                                  List<Type> typeargtypes) {
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2349
        return resolveQualifiedMethod(pos, env, site.tsym, site, name, argtypes, typeargtypes);
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2350
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2351
    Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2352
                                  Symbol location, Type site, Name name, List<Type> argtypes,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2353
                                  List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2354
        return resolveQualifiedMethod(new MethodResolutionContext(), pos, env, location, site, name, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2355
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2356
    private Symbol resolveQualifiedMethod(MethodResolutionContext resolveContext,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2357
                                  DiagnosticPosition pos, Env<AttrContext> env,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2358
                                  Symbol location, Type site, Name name, List<Type> argtypes,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2359
                                  List<Type> typeargtypes) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2360
        return lookupMethod(env, pos, location, resolveContext, new BasicLookupHelper(name, site, argtypes, typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2361
            @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2362
            Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2363
                return findMethod(env, site, name, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2364
                        phase.isBoxingRequired(),
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  2365
                        phase.isVarargsRequired());
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2366
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2367
            @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2368
            Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  2369
                if (sym.kind.isResolutionError()) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2370
                    sym = super.access(env, pos, location, sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2371
                } else if (allowMethodHandles) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2372
                    MethodSymbol msym = (MethodSymbol)sym;
18389
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18378
diff changeset
  2373
                    if ((msym.flags() & SIGNATURE_POLYMORPHIC) != 0) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2374
                        return findPolymorphicSignatureInstance(env, sym, argtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2375
                    }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2376
                }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2377
                return sym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2378
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2379
        });
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2380
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2381
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2382
    /** 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
  2383
     *  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
  2384
     *  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
  2385
     *  @param env       Attribution environment
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2386
     *  @param spMethod  signature polymorphic method - i.e. MH.invokeExact
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2387
     *  @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
  2388
     */
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2389
    Symbol findPolymorphicSignatureInstance(Env<AttrContext> env,
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2390
                                            final Symbol spMethod,
8036
17b976649c61 6992698: JSR 292: remove support for transient syntax in polymorphic signature calls
mcimadamore
parents: 8032
diff changeset
  2391
                                            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
  2392
        Type mtype = infer.instantiatePolymorphicSignatureInstance(env,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2393
                (MethodSymbol)spMethod, currentResolutionContext, argtypes);
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2394
        for (Symbol sym : polymorphicSignatureScope.getSymbolsByName(spMethod.name)) {
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2395
            if (types.isSameType(mtype, sym.type)) {
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2396
               return sym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2397
            }
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2398
        }
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2399
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2400
        // create the desired method
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2401
        long flags = ABSTRACT | HYPOTHETICAL | spMethod.flags() & Flags.AccessFlags;
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2402
        Symbol msym = new MethodSymbol(flags, spMethod.name, mtype, spMethod.owner) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2403
            @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2404
            public Symbol baseSymbol() {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2405
                return spMethod;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2406
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2407
        };
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2408
        polymorphicSignatureScope.enter(msym);
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2409
        return msym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2410
    }
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2411
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2412
    /** Resolve a qualified method identifier, throw a fatal error if not
06bc494ca11e Initial load
duke
parents:
diff changeset
  2413
     *  found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2414
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2415
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2416
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  2417
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2418
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2419
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2420
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2421
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2422
    public MethodSymbol resolveInternalMethod(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2423
                                        Type site, Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2424
                                        List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2425
                                        List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2426
        MethodResolutionContext resolveContext = new MethodResolutionContext();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2427
        resolveContext.internalResolution = true;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2428
        Symbol sym = resolveQualifiedMethod(resolveContext, pos, env, site.tsym,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2429
                site, name, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2430
        if (sym.kind == MTH) return (MethodSymbol)sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2431
        else throw new FatalError(
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2432
                 diags.fragment("fatal.err.cant.locate.meth",
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2433
                                name));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2434
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2435
06bc494ca11e Initial load
duke
parents:
diff changeset
  2436
    /** Resolve constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2437
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2438
     *  @param env       The environment current at the constructor invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2439
     *  @param site      The type of class for which a constructor is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2440
     *  @param argtypes  The types of the constructor invocation's value
06bc494ca11e Initial load
duke
parents:
diff changeset
  2441
     *                   arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2442
     *  @param typeargtypes  The types of the constructor invocation's type
06bc494ca11e Initial load
duke
parents:
diff changeset
  2443
     *                   arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2444
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2445
    Symbol resolveConstructor(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2446
                              Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2447
                              Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2448
                              List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2449
                              List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2450
        return resolveConstructor(new MethodResolutionContext(), pos, env, site, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2451
    }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2452
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2453
    private Symbol resolveConstructor(MethodResolutionContext resolveContext,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2454
                              final DiagnosticPosition pos,
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2455
                              Env<AttrContext> env,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2456
                              Type site,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2457
                              List<Type> argtypes,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2458
                              List<Type> typeargtypes) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2459
        return lookupMethod(env, pos, site.tsym, resolveContext, new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2460
            @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2461
            Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2462
                return findConstructor(pos, env, site, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2463
                        phase.isBoxingRequired(),
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2464
                        phase.isVarargsRequired());
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2465
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2466
        });
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2467
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2468
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2469
    /** Resolve a constructor, throw a fatal error if not found.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2470
     *  @param pos       The position to use for error reporting.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2471
     *  @param env       The environment current at the method invocation.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2472
     *  @param site      The type to be constructed.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2473
     *  @param argtypes  The types of the invocation's value arguments.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2474
     *  @param typeargtypes  The types of the invocation's type arguments.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2475
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2476
    public MethodSymbol resolveInternalConstructor(DiagnosticPosition pos, Env<AttrContext> env,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2477
                                        Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2478
                                        List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2479
                                        List<Type> typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2480
        MethodResolutionContext resolveContext = new MethodResolutionContext();
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2481
        resolveContext.internalResolution = true;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2482
        Symbol sym = resolveConstructor(resolveContext, pos, env, site, argtypes, typeargtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2483
        if (sym.kind == MTH) return (MethodSymbol)sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2484
        else throw new FatalError(
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2485
                 diags.fragment("fatal.err.cant.locate.ctor", site));
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2486
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2487
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2488
    Symbol findConstructor(DiagnosticPosition pos, Env<AttrContext> env,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2489
                              Type site, List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2490
                              List<Type> typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2491
                              boolean allowBoxing,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2492
                              boolean useVarargs) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2493
        Symbol sym = findMethod(env, site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2494
                                    names.init, argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2495
                                    typeargtypes, allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  2496
                                    useVarargs);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2497
        chk.checkDeprecated(pos, env.info.scope.owner, sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2498
        return sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2499
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2500
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2501
    /** Resolve constructor using diamond inference.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2502
     *  @param pos       The position to use for error reporting.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2503
     *  @param env       The environment current at the constructor invocation.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2504
     *  @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
  2505
     *                   The scope of this class has been touched in attribution.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2506
     *  @param argtypes  The types of the constructor invocation's value
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2507
     *                   arguments.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2508
     *  @param typeargtypes  The types of the constructor invocation's type
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2509
     *                   arguments.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2510
     */
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2511
    Symbol resolveDiamond(DiagnosticPosition pos,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2512
                              Env<AttrContext> env,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2513
                              Type site,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2514
                              List<Type> argtypes,
6344
f190fb7fdd2d 6975275: diamond implementation needs some cleanup
mcimadamore
parents: 6151
diff changeset
  2515
                              List<Type> typeargtypes) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2516
        return lookupMethod(env, pos, site.tsym, resolveMethodCheck,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2517
                new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2518
                    @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2519
                    Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2520
                        return findDiamond(env, site, argtypes, typeargtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2521
                                phase.isBoxingRequired(),
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2522
                                phase.isVarargsRequired());
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2523
                    }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2524
                    @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2525
                    Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  2526
                        if (sym.kind.isResolutionError()) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2527
                            if (sym.kind != WRONG_MTH &&
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2528
                                sym.kind != WRONG_MTHS) {
19917
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2529
                                sym = super.access(env, pos, location, sym);
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2530
                            } else {
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2531
                                final JCDiagnostic details = sym.kind == WRONG_MTH ?
24400
f05df7f58567 8037379: fix for JDK-8029569 doesn't cover all possible cases
vromero
parents: 24396
diff changeset
  2532
                                                ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
19917
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2533
                                                null;
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  2534
                                sym = new DiamondError(sym, currentResolutionContext);
19917
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2535
                                sym = accessMethod(sym, pos, site, names.init, true, argtypes, typeargtypes);
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2536
                                env.info.pendingResolutionPhase = currentResolutionContext.step;
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2537
                            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2538
                        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2539
                        return sym;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2540
                    }});
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2541
    }
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2542
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2543
    /** 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
  2544
     *  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
  2545
     *  {@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
  2546
     *  a method check is executed against the modified constructor type:
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13438
diff changeset
  2547
     *  {@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
  2548
     *  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
  2549
     *  the inferred type for the diamond operator.
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2550
     */
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2551
    private Symbol findDiamond(Env<AttrContext> env,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2552
                              Type site,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2553
                              List<Type> argtypes,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2554
                              List<Type> typeargtypes,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2555
                              boolean allowBoxing,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2556
                              boolean useVarargs) {
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2557
        Symbol bestSoFar = methodNotFound;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2558
        for (final Symbol sym : site.tsym.members().getSymbolsByName(names.init)) {
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2559
            //- System.out.println(" e " + e.sym);
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2560
            if (sym.kind == MTH &&
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2561
                (sym.flags_field & SYNTHETIC) == 0) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2562
                    List<Type> oldParams = sym.type.hasTag(FORALL) ?
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2563
                            ((ForAll)sym.type).tvars :
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2564
                            List.<Type>nil();
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2565
                    Type constrType = new ForAll(site.tsym.type.getTypeArguments().appendList(oldParams),
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24393
diff changeset
  2566
                                                 types.createMethodTypeWithReturn(sym.type.asMethodType(), site));
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2567
                    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
  2568
                        @Override
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2569
                        public Symbol baseSymbol() {
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2570
                            return sym;
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2571
                        }
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2572
                    };
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2573
                    bestSoFar = selectBest(env, site, argtypes, typeargtypes,
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2574
                            newConstr,
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2575
                            bestSoFar,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2576
                            allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  2577
                            useVarargs);
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2578
            }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2579
        }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2580
        return bestSoFar;
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2581
    }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2582
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2583
    Symbol getMemberReference(DiagnosticPosition pos,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2584
            Env<AttrContext> env,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2585
            JCMemberReference referenceTree,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2586
            Type site,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2587
            Name name) {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2588
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2589
        site = types.capture(site);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2590
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2591
        ReferenceLookupHelper lookupHelper = makeReferenceLookupHelper(
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2592
                referenceTree, site, name, List.<Type>nil(), null, VARARITY);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2593
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2594
        Env<AttrContext> newEnv = env.dup(env.tree, env.info.dup());
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2595
        Symbol sym = lookupMethod(newEnv, env.tree.pos(), site.tsym,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2596
                nilMethodCheck, lookupHelper);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2597
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2598
        env.info.pendingResolutionPhase = newEnv.info.pendingResolutionPhase;
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2599
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2600
        return sym;
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2601
    }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2602
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2603
    ReferenceLookupHelper makeReferenceLookupHelper(JCMemberReference referenceTree,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2604
                                  Type site,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2605
                                  Name name,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2606
                                  List<Type> argtypes,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2607
                                  List<Type> typeargtypes,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2608
                                  MethodResolutionPhase maxPhase) {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2609
        if (!name.equals(names.init)) {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2610
            //method reference
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2611
            return new MethodReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2612
        } else if (site.hasTag(ARRAY)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2613
            //array constructor reference
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2614
            return new ArrayConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2615
        } else {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2616
            //class constructor reference
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2617
            return new ConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2618
        }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2619
    }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2620
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2621
    /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2622
     * Resolution of member references is typically done as a single
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2623
     * overload resolution step, where the argument types A are inferred from
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2624
     * the target functional descriptor.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2625
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2626
     * If the member reference is a method reference with a type qualifier,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2627
     * a two-step lookup process is performed. The first step uses the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2628
     * expected argument list A, while the second step discards the first
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2629
     * type from A (which is treated as a receiver type).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2630
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2631
     * There are two cases in which inference is performed: (i) if the member
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2632
     * reference is a constructor reference and the qualifier type is raw - in
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2633
     * which case diamond inference is used to infer a parameterization for the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2634
     * type qualifier; (ii) if the member reference is an unbound reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2635
     * where the type qualifier is raw - in that case, during the unbound lookup
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2636
     * the receiver argument type is used to infer an instantiation for the raw
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2637
     * qualifier type.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2638
     *
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2639
     * When a multi-step resolution process is exploited, the process of picking
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2640
     * the resulting symbol is delegated to an helper class {@link com.sun.tools.javac.comp.Resolve.ReferenceChooser}.
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2641
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2642
     * This routine returns a pair (T,S), where S is the member reference symbol,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2643
     * 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
  2644
     * the type T might be dynamically inferred (i.e. if constructor reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2645
     * has a raw qualifier).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2646
     */
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2647
    Pair<Symbol, ReferenceLookupHelper> resolveMemberReference(Env<AttrContext> env,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2648
                                  JCMemberReference referenceTree,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2649
                                  Type site,
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2650
                                  Name name,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2651
                                  List<Type> argtypes,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2652
                                  List<Type> typeargtypes,
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2653
                                  MethodCheck methodCheck,
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2654
                                  InferenceContext inferenceContext,
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2655
                                  ReferenceChooser referenceChooser) {
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2656
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  2657
        //step 1 - bound lookup
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2658
        ReferenceLookupHelper boundLookupHelper = makeReferenceLookupHelper(
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2659
                referenceTree, site, name, argtypes, typeargtypes, VARARITY);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2660
        Env<AttrContext> boundEnv = env.dup(env.tree, env.info.dup());
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2661
        MethodResolutionContext boundSearchResolveContext = new MethodResolutionContext();
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2662
        boundSearchResolveContext.methodCheck = methodCheck;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2663
        Symbol boundSym = lookupMethod(boundEnv, env.tree.pos(),
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2664
                site.tsym, boundSearchResolveContext, boundLookupHelper);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2665
        ReferenceLookupResult boundRes = new ReferenceLookupResult(boundSym, boundSearchResolveContext);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2666
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2667
        //step 2 - unbound lookup
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2668
        Symbol unboundSym = methodNotFound;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2669
        Env<AttrContext> unboundEnv = env.dup(env.tree, env.info.dup());
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2670
        ReferenceLookupHelper unboundLookupHelper = boundLookupHelper.unboundLookup(inferenceContext);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2671
        ReferenceLookupResult unboundRes = referenceNotFound;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2672
        if (unboundLookupHelper != null) {
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2673
            MethodResolutionContext unboundSearchResolveContext =
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2674
                    new MethodResolutionContext();
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2675
            unboundSearchResolveContext.methodCheck = methodCheck;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2676
            unboundSym = lookupMethod(unboundEnv, env.tree.pos(),
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2677
                    site.tsym, unboundSearchResolveContext, unboundLookupHelper);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2678
            unboundRes = new ReferenceLookupResult(unboundSym, unboundSearchResolveContext);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2679
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2680
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2681
        //merge results
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2682
        Pair<Symbol, ReferenceLookupHelper> res;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2683
        Symbol bestSym = referenceChooser.result(boundRes, unboundRes);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2684
        res = new Pair<>(bestSym,
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2685
                bestSym == unboundSym ? unboundLookupHelper : boundLookupHelper);
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2686
        env.info.pendingResolutionPhase = bestSym == unboundSym ?
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2687
                unboundEnv.info.pendingResolutionPhase :
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2688
                boundEnv.info.pendingResolutionPhase;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2689
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2690
        return res;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2691
    }
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2692
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2693
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2694
     * This class is used to represent a method reference lookup result. It keeps track of two
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2695
     * things: (i) the symbol found during a method reference lookup and (ii) the static kind
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2696
     * of the lookup (see {@link com.sun.tools.javac.comp.Resolve.ReferenceLookupResult.StaticKind}).
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2697
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2698
    static class ReferenceLookupResult {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2699
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2700
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2701
         * Static kind associated with a method reference lookup. Erroneous lookups end up with
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2702
         * the UNDEFINED kind; successful lookups will end up with either STATIC, NON_STATIC,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2703
         * depending on whether all applicable candidates are static or non-static methods,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2704
         * respectively. If a successful lookup has both static and non-static applicable methods,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2705
         * its kind is set to BOTH.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2706
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2707
        enum StaticKind {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2708
            STATIC,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2709
            NON_STATIC,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2710
            BOTH,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2711
            UNDEFINED;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2712
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2713
            /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2714
             * Retrieve the static kind associated with a given (method) symbol.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2715
             */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2716
            static StaticKind from(Symbol s) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2717
                return s.isStatic() ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2718
                        STATIC : NON_STATIC;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2719
            }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2720
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2721
            /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2722
             * Merge two static kinds together.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2723
             */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2724
            static StaticKind reduce(StaticKind sk1, StaticKind sk2) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2725
                if (sk1 == UNDEFINED) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2726
                    return sk2;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2727
                } else if (sk2 == UNDEFINED) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2728
                    return sk1;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2729
                } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2730
                    return sk1 == sk2 ? sk1 : BOTH;
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2731
                }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2732
            }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2733
        }
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2734
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2735
        /** The static kind. */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2736
        StaticKind staticKind;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2737
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2738
        /** The lookup result. */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2739
        Symbol sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2740
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2741
        ReferenceLookupResult(Symbol sym, MethodResolutionContext resolutionContext) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2742
            this.staticKind = staticKind(sym, resolutionContext);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2743
            this.sym = sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2744
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2745
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2746
        private StaticKind staticKind(Symbol sym, MethodResolutionContext resolutionContext) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2747
            switch (sym.kind) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2748
                case MTH:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2749
                case AMBIGUOUS:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2750
                    return resolutionContext.candidates.stream()
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2751
                            .filter(c -> c.isApplicable() && c.step == resolutionContext.step)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2752
                            .map(c -> StaticKind.from(c.sym))
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2753
                            .reduce(StaticKind::reduce)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2754
                            .orElse(StaticKind.UNDEFINED);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2755
                case HIDDEN:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2756
                    return StaticKind.from(((AccessError)sym).sym);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2757
                default:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2758
                    return StaticKind.UNDEFINED;
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2759
            }
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2760
        }
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2761
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2762
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2763
         * Does this result corresponds to a successful lookup (i.e. one where a method has been found?)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2764
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2765
        boolean isSuccess() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2766
            return staticKind != StaticKind.UNDEFINED;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  2767
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2768
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2769
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2770
         * Does this result have given static kind?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2771
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2772
        boolean hasKind(StaticKind sk) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2773
            return this.staticKind == sk;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2774
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2775
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2776
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2777
         * Error recovery helper: can this lookup result be ignored (for the purpose of returning
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2778
         * some 'better' result) ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2779
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2780
        boolean canIgnore() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2781
            switch (sym.kind) {
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2782
                case ABSENT_MTH:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2783
                    return true;
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2784
                case WRONG_MTH:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2785
                    InapplicableSymbolError errSym =
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2786
                            (InapplicableSymbolError)sym.baseSymbol();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2787
                    return new Template(MethodCheckDiag.ARITY_MISMATCH.regex())
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2788
                            .matches(errSym.errCandidate().snd);
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2789
                case WRONG_MTHS:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2790
                    InapplicableSymbolsError errSyms =
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2791
                            (InapplicableSymbolsError)sym.baseSymbol();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2792
                    return errSyms.filterCandidates(errSyms.mapCandidates()).isEmpty();
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2793
                default:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2794
                    return false;
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2795
            }
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2796
        }
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2797
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2798
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2799
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2800
     * This abstract class embodies the logic that converts one (bound lookup) or two (unbound lookup)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2801
     * {@code ReferenceLookupResult} objects into a (@code Symbol), which is then regarded as the
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2802
     * result of method reference resolution.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2803
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2804
    abstract class ReferenceChooser {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2805
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2806
         * Generate a result from a pair of lookup result objects. This method delegates to the
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2807
         * appropriate result generation routine.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2808
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2809
        Symbol result(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2810
            return unboundRes != referenceNotFound ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2811
                    unboundResult(boundRes, unboundRes) :
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2812
                    boundResult(boundRes);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2813
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2814
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2815
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2816
         * Generate a symbol from a given bound lookup result.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2817
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2818
        abstract Symbol boundResult(ReferenceLookupResult boundRes);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2819
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2820
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2821
         * Generate a symbol from a pair of bound/unbound lookup results.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2822
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2823
        abstract Symbol unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2824
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2825
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2826
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2827
     * This chooser implements the selection strategy used during a full lookup; this logic
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2828
     * is described in JLS SE 8 (15.3.2).
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2829
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2830
    ReferenceChooser basicReferenceChooser = new ReferenceChooser() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2831
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2832
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2833
        Symbol boundResult(ReferenceLookupResult boundRes) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2834
            return !boundRes.isSuccess() || boundRes.hasKind(StaticKind.NON_STATIC) ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2835
                    boundRes.sym : //the search produces a non-static method
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2836
                    new BadMethodReferenceError(boundRes.sym, false);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2837
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2838
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2839
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2840
        Symbol unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2841
            if (boundRes.hasKind(StaticKind.STATIC) &&
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2842
                    (!unboundRes.isSuccess() || unboundRes.hasKind(StaticKind.STATIC))) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2843
                //the first search produces a static method and no non-static method is applicable
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2844
                //during the second search
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2845
                return boundRes.sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2846
            } else if (unboundRes.hasKind(StaticKind.NON_STATIC) &&
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2847
                    (!boundRes.isSuccess() || boundRes.hasKind(StaticKind.NON_STATIC))) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2848
                //the second search produces a non-static method and no static method is applicable
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2849
                //during the first search
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2850
                return unboundRes.sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2851
            } else if (boundRes.isSuccess() && unboundRes.isSuccess()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2852
                //both searches produce some result; ambiguity (error recovery)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2853
                return ambiguityError(boundRes.sym, unboundRes.sym);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2854
            } else if (boundRes.isSuccess() || unboundRes.isSuccess()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2855
                //Both searches failed to produce a result with correct staticness (i.e. first search
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2856
                //produces an non-static method). Alternatively, a given search produced a result
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2857
                //with the right staticness, but the other search has applicable methods with wrong
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2858
                //staticness (error recovery)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2859
                return new BadMethodReferenceError(boundRes.isSuccess() ? boundRes.sym : unboundRes.sym, true);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2860
            } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2861
                //both searches fail to produce a result - pick 'better' error using heuristics (error recovery)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2862
                return (boundRes.canIgnore() && !unboundRes.canIgnore()) ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2863
                        unboundRes.sym : boundRes.sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2864
            }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2865
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2866
    };
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2867
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2868
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2869
     * This chooser implements the selection strategy used during an arity-based lookup; this logic
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2870
     * is described in JLS SE 8 (15.12.2.1).
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2871
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2872
    ReferenceChooser structuralReferenceChooser = new ReferenceChooser() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2873
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2874
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2875
        Symbol boundResult(ReferenceLookupResult boundRes) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2876
            return (!boundRes.isSuccess() || !boundRes.hasKind(StaticKind.STATIC)) ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2877
                    boundRes.sym : //the search has at least one applicable non-static method
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2878
                    new BadMethodReferenceError(boundRes.sym, false);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2879
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2880
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2881
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2882
        Symbol unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2883
            if (boundRes.isSuccess() && !boundRes.hasKind(StaticKind.NON_STATIC)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2884
                //the first serach has at least one applicable static method
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2885
                return boundRes.sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2886
            } else if (unboundRes.isSuccess() && !unboundRes.hasKind(StaticKind.STATIC)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2887
                //the second search has at least one applicable non-static method
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2888
                return unboundRes.sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2889
            } else if (boundRes.isSuccess() || unboundRes.isSuccess()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2890
                //either the first search produces a non-static method, or second search produces
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2891
                //a non-static method (error recovery)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2892
                return new BadMethodReferenceError(boundRes.isSuccess() ? boundRes.sym : unboundRes.sym, true);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2893
            } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2894
                //both searches fail to produce a result - pick 'better' error using heuristics (error recovery)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2895
                return (boundRes.canIgnore() && !unboundRes.canIgnore()) ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2896
                        unboundRes.sym : boundRes.sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2897
            }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2898
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2899
    };
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2900
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2901
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2902
     * Helper for defining custom method-like lookup logic; a lookup helper
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2903
     * provides hooks for (i) the actual lookup logic and (ii) accessing the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2904
     * lookup result (this step might result in compiler diagnostics to be generated)
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2905
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2906
    abstract class LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2907
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2908
        /** name of the symbol to lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2909
        Name name;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2910
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2911
        /** location in which the lookup takes place */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2912
        Type site;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2913
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2914
        /** actual types used during the lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2915
        List<Type> argtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2916
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2917
        /** type arguments used during the lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2918
        List<Type> typeargtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2919
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2920
        /** Max overload resolution phase handled by this helper */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2921
        MethodResolutionPhase maxPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2922
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2923
        LookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2924
            this.name = name;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2925
            this.site = site;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2926
            this.argtypes = argtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2927
            this.typeargtypes = typeargtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2928
            this.maxPhase = maxPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2929
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2930
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2931
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2932
         * Should lookup stop at given phase with given result
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2933
         */
26533
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  2934
        final boolean shouldStop(Symbol sym, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2935
            return phase.ordinal() > maxPhase.ordinal() ||
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  2936
                !sym.kind.isResolutionError() || sym.kind == AMBIGUOUS;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2937
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2938
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2939
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2940
         * Search for a symbol under a given overload resolution phase - this method
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2941
         * is usually called several times, once per each overload resolution phase
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2942
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2943
        abstract Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2944
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2945
        /**
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2946
         * Dump overload resolution info
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2947
         */
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2948
        void debug(DiagnosticPosition pos, Symbol sym) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2949
            //do nothing
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2950
        }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2951
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2952
        /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2953
         * Validate the result of the lookup
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2954
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2955
        abstract Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2956
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2957
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2958
    abstract class BasicLookupHelper extends LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2959
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2960
        BasicLookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes) {
17804
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2961
            this(name, site, argtypes, typeargtypes, MethodResolutionPhase.VARARITY);
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2962
        }
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2963
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  2964
        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
  2965
            super(name, site, argtypes, typeargtypes, maxPhase);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2966
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2967
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2968
        @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2969
        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2970
            Symbol sym = doLookup(env, phase);
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2971
            if (sym.kind == AMBIGUOUS) {
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  2972
                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2973
                sym = a_err.mergeAbstracts(site);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  2974
            }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2975
            return sym;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2976
        }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2977
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2978
        abstract Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2979
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2980
        @Override
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2981
        Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  2982
            if (sym.kind.isResolutionError()) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2983
                //if nothing is found return the 'first' error
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2984
                sym = accessMethod(sym, pos, location, site, name, true, argtypes, typeargtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2985
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2986
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2987
        }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2988
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2989
        @Override
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2990
        void debug(DiagnosticPosition pos, Symbol sym) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2991
            reportVerboseResolutionDiagnostic(pos, name, site, argtypes, typeargtypes, sym);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2992
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2993
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2994
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2995
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2996
     * Helper class for member reference lookup. A reference lookup helper
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2997
     * defines the basic logic for member reference lookup; a method gives
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2998
     * access to an 'unbound' helper used to perform an unbound member
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2999
     * reference lookup.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3000
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3001
    abstract class ReferenceLookupHelper extends LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3002
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3003
        /** The member reference tree */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3004
        JCMemberReference referenceTree;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3005
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3006
        ReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3007
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3008
            super(name, site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3009
            this.referenceTree = referenceTree;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3010
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3011
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3012
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3013
         * Returns an unbound version of this lookup helper. By default, this
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3014
         * method returns an dummy lookup helper.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3015
         */
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3016
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3017
            return null;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3018
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3019
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3020
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3021
         * Get the kind of the member reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3022
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3023
        abstract JCMemberReference.ReferenceKind referenceKind(Symbol sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3024
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3025
        Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3026
            if (sym.kind == AMBIGUOUS) {
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  3027
                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3028
                sym = a_err.mergeAbstracts(site);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3029
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3030
            //skip error reporting
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3031
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3032
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3033
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3034
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3035
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3036
     * Helper class for method reference lookup. The lookup logic is based
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3037
     * upon Resolve.findMethod; in certain cases, this helper class has a
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3038
     * corresponding unbound helper class (see UnboundMethodReferenceLookupHelper).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3039
     * In such cases, non-static lookup results are thrown away.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3040
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3041
    class MethodReferenceLookupHelper extends ReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3042
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3043
        /** The original method reference lookup site. */
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3044
        Type originalSite;
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3045
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3046
        MethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3047
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3048
            super(referenceTree, name, types.skipTypeVars(site, true), argtypes, typeargtypes, maxPhase);
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3049
            this.originalSite = site;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3050
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3051
16323
c4409c235642 8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents: 16322
diff changeset
  3052
        @Override
c4409c235642 8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents: 16322
diff changeset
  3053
        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3054
            return findMethod(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3055
                    phase.isBoxingRequired(), phase.isVarargsRequired());
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3056
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3057
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3058
        @Override
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3059
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3060
            if (TreeInfo.isStaticSelector(referenceTree.expr, names)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3061
                if (argtypes.nonEmpty() &&
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3062
                        (argtypes.head.hasTag(NONE) ||
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3063
                        types.isSubtypeUnchecked(inferenceContext.asUndetVar(argtypes.head), site))) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3064
                    return new UnboundMethodReferenceLookupHelper(referenceTree, name,
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3065
                            originalSite, argtypes, typeargtypes, maxPhase);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3066
                } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3067
                    return new ReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3068
                        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3069
                        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3070
                            return this;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3071
                        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3072
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3073
                        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3074
                        Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3075
                            return methodNotFound;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3076
                        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3077
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3078
                        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3079
                        ReferenceKind referenceKind(Symbol sym) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3080
                            Assert.error();
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3081
                            return null;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3082
                        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3083
                    };
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3084
                }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3085
            } else {
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3086
                return super.unboundLookup(inferenceContext);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3087
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3088
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3089
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3090
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3091
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3092
            if (sym.isStatic()) {
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14547
diff changeset
  3093
                return ReferenceKind.STATIC;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3094
            } else {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3095
                Name selName = TreeInfo.name(referenceTree.getQualifierExpression());
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3096
                return selName != null && selName == names._super ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3097
                        ReferenceKind.SUPER :
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3098
                        ReferenceKind.BOUND;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3099
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3100
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3101
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3102
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3103
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3104
     * Helper class for unbound method reference lookup. Essentially the same
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3105
     * as the basic method reference lookup helper; main difference is that static
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3106
     * lookup results are thrown away. If qualifier type is raw, an attempt to
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3107
     * infer a parameterized type is made using the first actual argument (that
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3108
     * would otherwise be ignored during the lookup).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3109
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3110
    class UnboundMethodReferenceLookupHelper extends MethodReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3111
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3112
        UnboundMethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3113
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  3114
            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
  3115
            if (site.isRaw() && !argtypes.head.hasTag(NONE)) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3116
                Type asSuperSite = types.asSuper(argtypes.head, site.tsym);
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3117
                this.site = types.skipTypeVars(asSuperSite, true);
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  3118
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3119
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3120
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3121
        @Override
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3122
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3123
            return this;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3124
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3125
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3126
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3127
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3128
            return ReferenceKind.UNBOUND;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3129
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3130
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3131
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3132
    /**
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3133
     * Helper class for array constructor lookup; an array constructor lookup
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3134
     * 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
  3135
     * 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
  3136
     */
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3137
    class ArrayConstructorReferenceLookupHelper extends ReferenceLookupHelper {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3138
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3139
        ArrayConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes,
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3140
                List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3141
            super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3142
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3143
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3144
        @Override
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3145
        protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  3146
            WriteableScope sc = WriteableScope.create(syms.arrayClass);
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3147
            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
  3148
            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
  3149
            sc.enter(arrayConstr);
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3150
            return findMethodInScope(env, site, name, argtypes, typeargtypes, sc, methodNotFound, phase.isBoxingRequired(), phase.isVarargsRequired(), false);
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3151
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3152
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3153
        @Override
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3154
        ReferenceKind referenceKind(Symbol sym) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3155
            return ReferenceKind.ARRAY_CTOR;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3156
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3157
    }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3158
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3159
    /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3160
     * Helper class for constructor reference lookup. The lookup logic is based
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3161
     * upon either Resolve.findMethod or Resolve.findDiamond - depending on
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3162
     * whether the constructor reference needs diamond inference (this is the case
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3163
     * if the qualifier type is raw). A special erroneous symbol is returned
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3164
     * if the lookup returns the constructor of an inner class and there's no
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3165
     * enclosing instance in scope.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3166
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3167
    class ConstructorReferenceLookupHelper extends ReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3168
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3169
        boolean needsInference;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3170
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3171
        ConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3172
                List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3173
            super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3174
            if (site.isRaw()) {
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26533
diff changeset
  3175
                this.site = new ClassType(site.getEnclosingType(), site.tsym.type.getTypeArguments(), site.tsym, site.getMetadata());
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3176
                needsInference = true;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3177
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3178
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3179
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3180
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3181
        protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3182
            Symbol sym = needsInference ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3183
                findDiamond(env, site, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) :
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3184
                findMethod(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3185
                        phase.isBoxingRequired(), phase.isVarargsRequired());
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3186
            return (sym.kind != MTH ||
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3187
                    site.getEnclosingType().hasTag(NONE) ||
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3188
                    hasEnclosingInstance(env, site)) ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3189
                    sym : new BadConstructorReferenceError(sym);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3190
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3191
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3192
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3193
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3194
            return site.getEnclosingType().hasTag(NONE) ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3195
                    ReferenceKind.TOPLEVEL : ReferenceKind.IMPLICIT_INNER;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3196
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3197
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3198
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3199
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3200
     * Main overload resolution routine. On each overload resolution step, a
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3201
     * lookup helper class is used to perform the method/constructor lookup;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3202
     * at the end of the lookup, the helper is used to validate the results
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3203
     * (this last step might trigger overload resolution diagnostics).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3204
     */
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3205
    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
  3206
        MethodResolutionContext resolveContext = new MethodResolutionContext();
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3207
        resolveContext.methodCheck = methodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3208
        return lookupMethod(env, pos, location, resolveContext, lookupHelper);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3209
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3210
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3211
    Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3212
            MethodResolutionContext resolveContext, LookupHelper lookupHelper) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3213
        MethodResolutionContext prevResolutionContext = currentResolutionContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3214
        try {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3215
            Symbol bestSoFar = methodNotFound;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3216
            currentResolutionContext = resolveContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3217
            for (MethodResolutionPhase phase : methodResolutionSteps) {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25443
diff changeset
  3218
                if (lookupHelper.shouldStop(bestSoFar, phase))
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25443
diff changeset
  3219
                    break;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3220
                MethodResolutionPhase prevPhase = currentResolutionContext.step;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3221
                Symbol prevBest = bestSoFar;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3222
                currentResolutionContext.step = phase;
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3223
                Symbol sym = lookupHelper.lookup(env, phase);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3224
                lookupHelper.debug(pos, sym);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3225
                bestSoFar = phase.mergeResults(bestSoFar, sym);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3226
                env.info.pendingResolutionPhase = (prevBest == bestSoFar) ? prevPhase : phase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3227
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3228
            return lookupHelper.access(env, pos, location, bestSoFar);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3229
        } finally {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3230
            currentResolutionContext = prevResolutionContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3231
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3232
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3233
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3234
    /**
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3235
     * Resolve `c.name' where name == this or name == super.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3236
     * @param pos           The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3237
     * @param env           The environment current at the expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3238
     * @param c             The qualifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3239
     * @param name          The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3240
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3241
    Symbol resolveSelf(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3242
                       Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3243
                       TypeSymbol c,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3244
                       Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3245
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3246
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3247
        while (env1.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3248
            if (isStatic(env1)) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3249
            if (env1.enclClass.sym == c) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  3250
                Symbol sym = env1.info.scope.findFirst(name);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3251
                if (sym != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3252
                    if (staticOnly) sym = new StaticError(sym);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3253
                    return accessBase(sym, pos, env.enclClass.sym.type,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3254
                                  name, true);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3255
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3256
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3257
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3258
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3259
        }
23105
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  3260
        if (c.isInterface() &&
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  3261
            name == names._super && !isStatic(env) &&
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  3262
            types.isDirectSuperInterface(c, env.enclClass.sym)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3263
            //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
  3264
            for (Type t : pruneInterfaces(env.enclClass.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3265
                if (t.tsym == c) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3266
                    env.info.defaultSuperCallSite = t;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3267
                    return new VarSymbol(0, names._super,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3268
                            types.asSuper(env.enclClass.type, c), env.enclClass.sym);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3269
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3270
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3271
            //find a direct superinterface that is a subtype of 'c'
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3272
            for (Type i : types.interfaces(env.enclClass.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3273
                if (i.tsym.isSubClass(c, types) && i.tsym != c) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3274
                    log.error(pos, "illegal.default.super.call", c,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3275
                            diags.fragment("redundant.supertype", c, i));
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3276
                    return syms.errSymbol;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3277
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3278
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3279
            Assert.error();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3280
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3281
        log.error(pos, "not.encl.class", c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3282
        return syms.errSymbol;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3283
    }
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3284
    //where
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3285
    private List<Type> pruneInterfaces(Type t) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19940
diff changeset
  3286
        ListBuffer<Type> result = new ListBuffer<>();
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3287
        for (Type t1 : types.interfaces(t)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3288
            boolean shouldAdd = true;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3289
            for (Type t2 : types.interfaces(t)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3290
                if (t1 != t2 && types.isSubtypeNoCapture(t2, t1)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3291
                    shouldAdd = false;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3292
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3293
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3294
            if (shouldAdd) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3295
                result.append(t1);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3296
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3297
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3298
        return result.toList();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3299
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3300
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3301
06bc494ca11e Initial load
duke
parents:
diff changeset
  3302
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  3303
     * Resolve `c.this' for an enclosing class c that contains the
06bc494ca11e Initial load
duke
parents:
diff changeset
  3304
     * named member.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3305
     * @param pos           The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3306
     * @param env           The environment current at the expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3307
     * @param member        The member that must be contained in the result.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3308
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3309
    Symbol resolveSelfContaining(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3310
                                 Env<AttrContext> env,
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3311
                                 Symbol member,
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3312
                                 boolean isSuperCall) {
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3313
        Symbol sym = resolveSelfContainingInternal(env, member, isSuperCall);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3314
        if (sym == null) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3315
            log.error(pos, "encl.class.required", member);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3316
            return syms.errSymbol;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3317
        } else {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3318
            return accessBase(sym, pos, env.enclClass.sym.type, sym.name, true);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3319
        }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3320
    }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3321
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3322
    boolean hasEnclosingInstance(Env<AttrContext> env, Type type) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3323
        Symbol encl = resolveSelfContainingInternal(env, type.tsym, false);
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  3324
        return encl != null && !encl.kind.isResolutionError();
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3325
    }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3326
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3327
    private Symbol resolveSelfContainingInternal(Env<AttrContext> env,
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3328
                                 Symbol member,
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3329
                                 boolean isSuperCall) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3330
        Name name = names._this;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3331
        Env<AttrContext> env1 = isSuperCall ? env.outer : env;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3332
        boolean staticOnly = false;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3333
        if (env1 != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3334
            while (env1 != null && env1.outer != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3335
                if (isStatic(env1)) staticOnly = true;
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3336
                if (env1.enclClass.sym.isSubClass(member.owner, types)) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  3337
                    Symbol sym = env1.info.scope.findFirst(name);
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3338
                    if (sym != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3339
                        if (staticOnly) sym = new StaticError(sym);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3340
                        return sym;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3341
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3342
                }
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3343
                if ((env1.enclClass.sym.flags() & STATIC) != 0)
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3344
                    staticOnly = true;
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3345
                env1 = env1.outer;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3346
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3347
        }
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3348
        return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3349
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3350
06bc494ca11e Initial load
duke
parents:
diff changeset
  3351
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  3352
     * 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
  3353
     * JLS 8.8.5.1 and 15.9.2
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3354
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3355
    Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t) {
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3356
        return resolveImplicitThis(pos, env, t, false);
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3357
    }
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3358
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3359
    Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t, boolean isSuperCall) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3360
        Type thisType = (t.tsym.owner.kind.matches(KindSelector.VAL_MTH)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3361
                         ? resolveSelf(pos, env, t.getEnclosingType().tsym, names._this)
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3362
                         : resolveSelfContaining(pos, env, t.tsym, isSuperCall)).type;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3363
        if (env.info.isSelfCall && thisType.tsym == env.enclClass.sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3364
            log.error(pos, "cant.ref.before.ctor.called", "this");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3365
        return thisType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3366
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3367
06bc494ca11e Initial load
duke
parents:
diff changeset
  3368
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  3369
 *  ResolveError classes, indicating error situations when accessing symbols
06bc494ca11e Initial load
duke
parents:
diff changeset
  3370
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  3371
12082
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3372
    //used by TransTypes when checking target type of synthetic cast
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3373
    public void logAccessErrorInternal(Env<AttrContext> env, JCTree tree, Type type) {
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3374
        AccessError error = new AccessError(env, env.enclClass.type, type.tsym);
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3375
        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
  3376
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3377
    //where
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3378
    private void logResolveError(ResolveError error,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3379
            DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3380
            Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3381
            Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3382
            Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3383
            List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3384
            List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3385
        JCDiagnostic d = error.getDiagnostic(JCDiagnostic.DiagnosticType.ERROR,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3386
                pos, location, site, name, argtypes, typeargtypes);
6356
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3387
        if (d != null) {
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3388
            d.setFlag(DiagnosticFlag.RESOLVE_ERROR);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3389
            log.report(d);
6356
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3390
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3391
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3392
1534
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3393
    private final LocalizedString noArgs = new LocalizedString("compiler.misc.no.args");
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3394
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3395
    public Object methodArguments(List<Type> argtypes) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3396
        if (argtypes == null || argtypes.isEmpty()) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3397
            return noArgs;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3398
        } else {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19940
diff changeset
  3399
            ListBuffer<Object> diagArgs = new ListBuffer<>();
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3400
            for (Type t : argtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  3401
                if (t.hasTag(DEFERRED)) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3402
                    diagArgs.append(((DeferredAttr.DeferredType)t).tree);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3403
                } else {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3404
                    diagArgs.append(t);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3405
                }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3406
            }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3407
            return diagArgs;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3408
        }
1534
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3409
    }
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3410
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3411
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3412
     * Root class for resolution errors. Subclass of ResolveError
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3413
     * represent a different kinds of resolution error - as such they must
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3414
     * specify how they map into concrete compiler diagnostics.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3415
     */
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3416
    abstract class ResolveError extends Symbol {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3417
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3418
        /** The name of the kind of error, for debugging only. */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3419
        final String debugName;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3420
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3421
        ResolveError(Kind kind, String debugName) {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3422
            super(kind, 0, null, null, null);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3423
            this.debugName = debugName;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3424
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3425
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  3426
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3427
        public <R, P> R accept(ElementVisitor<R, P> v, P p) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3428
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3429
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3430
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3431
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3432
        public String toString() {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3433
            return debugName;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3434
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3435
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3436
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3437
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3438
            return false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3439
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3440
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3441
        @Override
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3442
        public boolean isStatic() {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3443
            return false;
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3444
        }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3445
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3446
        /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3447
         * Create an external representation for this erroneous symbol to be
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3448
         * used during attribution - by default this returns the symbol of a
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3449
         * brand new error type which stores the original type found
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3450
         * during resolution.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3451
         *
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3452
         * @param name     the name used during resolution
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3453
         * @param location the location from which the symbol is accessed
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3454
         */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3455
        protected Symbol access(Name name, TypeSymbol location) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3456
            return types.createErrorType(name, location, syms.errSymbol.type).tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3457
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3458
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3459
        /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3460
         * Create a diagnostic representing this resolution error.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3461
         *
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3462
         * @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
  3463
         * @param pos       The position to be used for error reporting.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3464
         * @param site      The original type from where the selection took place.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3465
         * @param name      The name of the symbol to be resolved.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3466
         * @param argtypes  The invocation's value arguments,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3467
         *                  if we looked for a method.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3468
         * @param typeargtypes  The invocation's type arguments,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3469
         *                      if we looked for a method.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3470
         */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3471
        abstract JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3472
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3473
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3474
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3475
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3476
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3477
                List<Type> typeargtypes);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3478
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3479
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3480
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3481
     * 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
  3482
     * an invalid symbol being found during resolution.
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
    abstract class InvalidSymbolError extends ResolveError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3485
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3486
        /** The invalid symbol found during resolution */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3487
        Symbol sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3488
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3489
        InvalidSymbolError(Kind kind, Symbol sym, String debugName) {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3490
            super(kind, debugName);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3491
            this.sym = sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3492
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3493
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3494
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3495
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3496
            return true;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3497
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3498
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3499
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3500
        public String toString() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3501
             return super.toString() + " wrongSym=" + sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3502
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3503
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3504
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3505
        public Symbol access(Name name, TypeSymbol location) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  3506
            if (!sym.kind.isResolutionError() && sym.kind.matches(KindSelector.TYP))
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3507
                return types.createErrorType(name, location, sym.type).tsym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3508
            else
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3509
                return sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3510
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3511
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3512
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3513
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3514
     * InvalidSymbolError error class indicating that a symbol matching a
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3515
     * given name does not exists in a given site.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3516
     */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3517
    class SymbolNotFoundError extends ResolveError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3518
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3519
        SymbolNotFoundError(Kind kind) {
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3520
            this(kind, "symbol not found error");
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3521
        }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3522
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3523
        SymbolNotFoundError(Kind kind, String debugName) {
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3524
            super(kind, debugName);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3525
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3526
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3527
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3528
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3529
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3530
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3531
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3532
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3533
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3534
                List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3535
            argtypes = argtypes == null ? List.<Type>nil() : argtypes;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3536
            typeargtypes = typeargtypes == null ? List.<Type>nil() : typeargtypes;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3537
            if (name == names.error)
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3538
                return null;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3539
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3540
            boolean hasLocation = false;
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3541
            if (location == null) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3542
                location = site.tsym;
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3543
            }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3544
            if (!location.name.isEmpty()) {
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3545
                if (location.kind == PCK && !site.tsym.exists()) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3546
                    return diags.create(dkind, log.currentSource(), pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3547
                        "doesnt.exist", location);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3548
                }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3549
                hasLocation = !location.name.equals(names._this) &&
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3550
                        !location.name.equals(names._super);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3551
            }
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3552
            boolean isConstructor = name == names.init;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3553
            KindName kindname = isConstructor ? KindName.CONSTRUCTOR : kind.absentKind();
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3554
            Name idname = isConstructor ? site.tsym.name : name;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3555
            String errKey = getErrorKey(kindname, typeargtypes.nonEmpty(), hasLocation);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3556
            if (hasLocation) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3557
                return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3558
                        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
  3559
                        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
  3560
                        getLocationDiag(location, site)); //location kindname, type
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3561
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3562
            else {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3563
                return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3564
                        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
  3565
                        typeargtypes, args(argtypes)); //type parameters and arguments (if any)
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3566
            }
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
        //where
14953
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3569
        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
  3570
            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
  3571
        }
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3572
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3573
        private String getErrorKey(KindName kindname, boolean hasTypeArgs, boolean hasLocation) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3574
            String key = "cant.resolve";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3575
            String suffix = hasLocation ? ".location" : "";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3576
            switch (kindname) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3577
                case METHOD:
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3578
                case CONSTRUCTOR: {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3579
                    suffix += ".args";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3580
                    suffix += hasTypeArgs ? ".params" : "";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3581
                }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3582
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3583
            return key + suffix;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3584
        }
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3585
        private JCDiagnostic getLocationDiag(Symbol location, Type site) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3586
            if (location.kind == VAR) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3587
                return diags.fragment("location.1",
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3588
                    kindName(location),
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3589
                    location,
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3590
                    location.type);
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3591
            } else {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3592
                return diags.fragment("location",
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3593
                    typeKindName(site),
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3594
                    site,
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3595
                    null);
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3596
            }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3597
        }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3598
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3599
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3600
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3601
     * InvalidSymbolError error class indicating that a given symbol
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3602
     * (either a method, a constructor or an operand) is not applicable
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3603
     * given an actual arguments/type argument list.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3604
     */
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3605
    class InapplicableSymbolError extends ResolveError {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3606
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3607
        protected MethodResolutionContext resolveContext;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3608
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3609
        InapplicableSymbolError(MethodResolutionContext context) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3610
            this(WRONG_MTH, "inapplicable symbol error", context);
3143
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
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3613
        protected InapplicableSymbolError(Kind kind, String debugName, MethodResolutionContext context) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3614
            super(kind, debugName);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3615
            this.resolveContext = context;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3616
        }
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
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3619
        public String toString() {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3620
            return super.toString();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3621
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3622
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3623
        @Override
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3624
        public boolean exists() {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3625
            return true;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3626
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3627
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3628
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3629
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3630
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3631
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3632
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3633
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3634
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3635
                List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3636
            if (name == names.error)
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3637
                return null;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3638
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3639
            Pair<Symbol, JCDiagnostic> c = errCandidate();
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3640
            if (compactMethodDiags) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3641
                JCDiagnostic simpleDiag =
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3642
                    MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, c.snd);
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3643
                if (simpleDiag != null) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3644
                    return simpleDiag;
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3645
                }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3646
            }
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3647
            Symbol ws = c.fst.asMemberOf(site, types);
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3648
            return diags.create(dkind, log.currentSource(), pos,
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3649
                      "cant.apply.symbol",
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3650
                      kindName(ws),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3651
                      ws.name == names.init ? ws.owner.name : ws.name,
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3652
                      methodArguments(ws.type.getParameterTypes()),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3653
                      methodArguments(argtypes),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3654
                      kindName(ws.owner),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3655
                      ws.owner.type,
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3656
                      c.snd);
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
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3659
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3660
        public Symbol access(Name name, TypeSymbol location) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3661
            return types.createErrorType(name, location, syms.errSymbol.type).tsym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3662
        }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3663
18913
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3664
        protected Pair<Symbol, JCDiagnostic> errCandidate() {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3665
            Candidate bestSoFar = null;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3666
            for (Candidate c : resolveContext.candidates) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3667
                if (c.isApplicable()) continue;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3668
                bestSoFar = c;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3669
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3670
            Assert.checkNonNull(bestSoFar);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  3671
            return new Pair<>(bestSoFar.sym, bestSoFar.details);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3672
        }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3673
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3674
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3675
    /**
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3676
     * ResolveError error class indicating that a symbol (either methods, constructors or operand)
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3677
     * is not applicable given an actual arguments/type argument list.
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3678
     */
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3679
    class InapplicableSymbolsError extends InapplicableSymbolError {
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3680
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3681
        InapplicableSymbolsError(MethodResolutionContext context) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3682
            super(WRONG_MTHS, "inapplicable symbols", context);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3683
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3684
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3685
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3686
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3687
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3688
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3689
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3690
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3691
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3692
                List<Type> typeargtypes) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3693
            Map<Symbol, JCDiagnostic> candidatesMap = mapCandidates();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3694
            Map<Symbol, JCDiagnostic> filteredCandidates = compactMethodDiags ?
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3695
                    filterCandidates(candidatesMap) :
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3696
                    mapCandidates();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3697
            if (filteredCandidates.isEmpty()) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3698
                filteredCandidates = candidatesMap;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3699
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3700
            boolean truncatedDiag = candidatesMap.size() != filteredCandidates.size();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3701
            if (filteredCandidates.size() > 1) {
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3702
                JCDiagnostic err = diags.create(dkind,
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3703
                        null,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3704
                        truncatedDiag ?
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3705
                            EnumSet.of(DiagnosticFlag.COMPRESSED) :
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3706
                            EnumSet.noneOf(DiagnosticFlag.class),
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3707
                        log.currentSource(),
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3708
                        pos,
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3709
                        "cant.apply.symbols",
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3710
                        name == names.init ? KindName.CONSTRUCTOR : kind.absentKind(),
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3711
                        name == names.init ? site.tsym.name : name,
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  3712
                        methodArguments(argtypes));
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3713
                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
  3714
            } else if (filteredCandidates.size() == 1) {
18913
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3715
                Map.Entry<Symbol, JCDiagnostic> _e =
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3716
                                filteredCandidates.entrySet().iterator().next();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  3717
                final Pair<Symbol, JCDiagnostic> p = new Pair<>(_e.getKey(), _e.getValue());
18913
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3718
                JCDiagnostic d = new InapplicableSymbolError(resolveContext) {
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3719
                    @Override
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3720
                    protected Pair<Symbol, JCDiagnostic> errCandidate() {
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3721
                        return p;
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3722
                    }
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  3723
                }.getDiagnostic(dkind, pos,
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3724
                    location, site, name, argtypes, typeargtypes);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3725
                if (truncatedDiag) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3726
                    d.setFlag(DiagnosticFlag.COMPRESSED);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3727
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3728
                return d;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3729
            } else {
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3730
                return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind, pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3731
                    location, site, name, argtypes, typeargtypes);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3732
            }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3733
        }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  3734
        //where
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3735
            private Map<Symbol, JCDiagnostic> mapCandidates() {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  3736
                Map<Symbol, JCDiagnostic> candidates = new LinkedHashMap<>();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3737
                for (Candidate c : resolveContext.candidates) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3738
                    if (c.isApplicable()) continue;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3739
                    candidates.put(c.sym, c.details);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3740
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3741
                return candidates;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3742
            }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3743
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3744
            Map<Symbol, JCDiagnostic> filterCandidates(Map<Symbol, JCDiagnostic> candidatesMap) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  3745
                Map<Symbol, JCDiagnostic> candidates = new LinkedHashMap<>();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3746
                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
  3747
                    JCDiagnostic d = _entry.getValue();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3748
                    if (!new Template(MethodCheckDiag.ARITY_MISMATCH.regex()).matches(d)) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3749
                        candidates.put(_entry.getKey(), d);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3750
                    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3751
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3752
                return candidates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3753
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3754
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3755
            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
  3756
                List<JCDiagnostic> details = List.nil();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3757
                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
  3758
                    Symbol sym = _entry.getKey();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3759
                    JCDiagnostic detailDiag = diags.fragment("inapplicable.method",
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3760
                            Kinds.kindName(sym),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3761
                            sym.location(site, types),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3762
                            sym.asMemberOf(site, types),
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3763
                            _entry.getValue());
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3764
                    details = details.prepend(detailDiag);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3765
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3766
                //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
  3767
                //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
  3768
                //conform to source order
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3769
                return details;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  3770
            }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3771
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3772
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3773
    /**
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3774
     * DiamondError error class indicating that a constructor symbol is not applicable
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3775
     * given an actual arguments/type argument list using diamond inference.
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3776
     */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3777
    class DiamondError extends InapplicableSymbolError {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3778
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3779
        Symbol sym;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3780
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3781
        public DiamondError(Symbol sym, MethodResolutionContext context) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3782
            super(sym.kind, "diamondError", context);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3783
            this.sym = sym;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3784
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3785
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3786
        JCDiagnostic getDetails() {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3787
            return (sym.kind == WRONG_MTH) ?
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3788
                    ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3789
                    null;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3790
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3791
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3792
        @Override
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3793
        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3794
                Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3795
            JCDiagnostic details = getDetails();
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3796
            if (details != null && compactMethodDiags) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3797
                JCDiagnostic simpleDiag =
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3798
                        MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, details);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3799
                if (simpleDiag != null) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3800
                    return simpleDiag;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3801
                }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3802
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3803
            String key = details == null ?
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3804
                "cant.apply.diamond" :
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3805
                "cant.apply.diamond.1";
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3806
            return diags.create(dkind, log.currentSource(), pos, key,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3807
                    diags.fragment("diamond", site.tsym), details);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3808
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3809
    }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3810
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  3811
    /**
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3812
     * An InvalidSymbolError error class indicating that a symbol is not
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3813
     * accessible from a given site
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3814
     */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3815
    class AccessError extends InvalidSymbolError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3816
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3817
        private Env<AttrContext> env;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3818
        private Type site;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3819
06bc494ca11e Initial load
duke
parents:
diff changeset
  3820
        AccessError(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3821
            this(null, null, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3822
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3823
06bc494ca11e Initial load
duke
parents:
diff changeset
  3824
        AccessError(Env<AttrContext> env, Type site, Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3825
            super(HIDDEN, sym, "access error");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3826
            this.env = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3827
            this.site = site;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3828
            if (debugResolve)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3829
                log.error("proc.messager", sym + " @ " + site + " is inaccessible.");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3830
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3831
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3832
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3833
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3834
            return false;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3835
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3836
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3837
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3838
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3839
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3840
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3841
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3842
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3843
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3844
                List<Type> typeargtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  3845
            if (sym.owner.type.hasTag(ERROR))
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3846
                return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3847
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3848
            if (sym.name == names.init && sym.owner != site.tsym) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3849
                return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3850
                        pos, location, site, name, argtypes, typeargtypes);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3851
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3852
            else if ((sym.flags() & PUBLIC) != 0
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3853
                || (env != null && this.site != null
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3854
                    && !isAccessible(env, this.site))) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3855
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3856
                        pos, "not.def.access.class.intf.cant.access",
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3857
                    sym, sym.location());
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3858
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3859
            else if ((sym.flags() & (PRIVATE | PROTECTED)) != 0) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3860
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3861
                        pos, "report.access", sym,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3862
                        asFlagSet(sym.flags() & (PRIVATE | PROTECTED)),
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3863
                        sym.location());
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3864
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3865
            else {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3866
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3867
                        pos, "not.def.public.cant.access", sym, sym.location());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3868
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3869
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3870
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3871
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3872
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3873
     * InvalidSymbolError error class indicating that an instance member
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3874
     * has erroneously been accessed from a static context.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3875
     */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3876
    class StaticError extends InvalidSymbolError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3877
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3878
        StaticError(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3879
            super(STATICERR, sym, "static error");
06bc494ca11e Initial load
duke
parents:
diff changeset
  3880
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3881
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3882
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3883
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3884
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3885
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3886
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3887
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3888
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3889
                List<Type> typeargtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  3890
            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
  3891
                ? types.erasure(sym.type).tsym
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 735
diff changeset
  3892
                : sym);
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3893
            return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3894
                    "non-static.cant.be.ref", kindName(sym), errSym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3895
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3896
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3897
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3898
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3899
     * InvalidSymbolError error class indicating that a pair of symbols
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3900
     * (either methods, constructors or operands) are ambiguous
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3901
     * given an actual arguments/type argument list.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3902
     */
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3903
    class AmbiguityError extends ResolveError {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3904
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3905
        /** The other maximally specific symbol */
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3906
        List<Symbol> ambiguousSyms = List.nil();
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3907
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3908
        @Override
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3909
        public boolean exists() {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3910
            return true;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3911
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3912
06bc494ca11e Initial load
duke
parents:
diff changeset
  3913
        AmbiguityError(Symbol sym1, Symbol sym2) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3914
            super(AMBIGUOUS, "ambiguity error");
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3915
            ambiguousSyms = flatten(sym2).appendList(flatten(sym1));
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3916
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3917
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3918
        private List<Symbol> flatten(Symbol sym) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3919
            if (sym.kind == AMBIGUOUS) {
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  3920
                return ((AmbiguityError)sym.baseSymbol()).ambiguousSyms;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3921
            } else {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3922
                return List.of(sym);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3923
            }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3924
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3925
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3926
        AmbiguityError addAmbiguousSymbol(Symbol s) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3927
            ambiguousSyms = ambiguousSyms.prepend(s);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3928
            return this;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3929
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3930
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3931
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3932
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3933
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3934
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3935
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3936
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3937
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3938
                List<Type> typeargtypes) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3939
            List<Symbol> diagSyms = ambiguousSyms.reverse();
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3940
            Symbol s1 = diagSyms.head;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3941
            Symbol s2 = diagSyms.tail.head;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3942
            Name sname = s1.name;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3943
            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
  3944
            return diags.create(dkind, log.currentSource(),
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3945
                    pos, "ref.ambiguous", sname,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3946
                    kindName(s1),
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3947
                    s1,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3948
                    s1.location(site, types),
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3949
                    kindName(s2),
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3950
                    s2,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3951
                    s2.location(site, types));
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3952
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3953
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3954
        /**
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3955
         * If multiple applicable methods are found during overload and none of them
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3956
         * is more specific than the others, attempt to merge their signatures.
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3957
         */
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3958
        Symbol mergeAbstracts(Type site) {
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3959
            List<Symbol> ambiguousInOrder = ambiguousSyms.reverse();
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3960
            for (Symbol s : ambiguousInOrder) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3961
                Type mt = types.memberType(site, s);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3962
                boolean found = true;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3963
                List<Type> allThrown = mt.getThrownTypes();
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3964
                for (Symbol s2 : ambiguousInOrder) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3965
                    Type mt2 = types.memberType(site, s2);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3966
                    if ((s2.flags() & ABSTRACT) == 0 ||
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3967
                        !types.overrideEquivalent(mt, mt2) ||
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3968
                        !types.isSameTypes(s.erasure(types).getParameterTypes(),
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3969
                                       s2.erasure(types).getParameterTypes())) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3970
                        //ambiguity cannot be resolved
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3971
                        return this;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3972
                    }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3973
                    Type mst = mostSpecificReturnType(mt, mt2);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3974
                    if (mst == null || mst != mt) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3975
                        found = false;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3976
                        break;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3977
                    }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3978
                    allThrown = chk.intersect(allThrown, mt2.getThrownTypes());
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3979
                }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3980
                if (found) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3981
                    //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
  3982
                    //most specific return type then others
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3983
                    return (allThrown == mt.getThrownTypes()) ?
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3984
                            s : new MethodSymbol(
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3985
                                s.flags(),
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3986
                                s.name,
27842
edd6dd917166 8064803: Javac erroneously uses instantiated signatures when merging abstract most-specific methods
mcimadamore
parents: 27386
diff changeset
  3987
                                types.createMethodTypeWithThrown(s.type, allThrown),
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3988
                                s.owner);
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3989
                }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3990
            }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3991
            return this;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3992
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3993
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3994
        @Override
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3995
        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
  3996
            Symbol firstAmbiguity = ambiguousSyms.last();
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  3997
            return firstAmbiguity.kind == TYP ?
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  3998
                    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
  3999
                    firstAmbiguity;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4000
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4001
    }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4002
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4003
    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
  4004
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4005
        ResolveError delegatedError;
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4006
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4007
        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
  4008
            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
  4009
            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
  4010
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4011
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4012
        @Override
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4013
        public Symbol baseSymbol() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4014
            return delegatedError.baseSymbol();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4015
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4016
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4017
        @Override
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4018
        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
  4019
            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
  4020
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4021
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4022
        @Override
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4023
        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
  4024
            return true;
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4025
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4026
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4027
        @Override
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4028
        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
  4029
            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
  4030
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4031
    }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4032
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4033
    /**
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4034
     * BadMethodReferenceError error class indicating that a method reference symbol has been found,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4035
     * but with the wrong staticness.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4036
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4037
    class BadMethodReferenceError extends StaticError {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4038
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4039
        boolean unboundLookup;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4040
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4041
        public BadMethodReferenceError(Symbol sym, boolean unboundLookup) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4042
            super(sym);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4043
            this.unboundLookup = unboundLookup;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4044
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4045
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4046
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4047
        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4048
            final String key;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4049
            if (!unboundLookup) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4050
                key = "bad.static.method.in.bound.lookup";
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4051
            } else if (sym.isStatic()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4052
                key = "bad.static.method.in.unbound.lookup";
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4053
            } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4054
                key = "bad.instance.method.in.unbound.lookup";
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4055
            }
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  4056
            return sym.kind.isResolutionError() ?
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4057
                    ((ResolveError)sym).getDiagnostic(dkind, pos, location, site, name, argtypes, typeargtypes) :
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4058
                    diags.create(dkind, log.currentSource(), pos, key, Kinds.kindName(sym), sym);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4059
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4060
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4061
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4062
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4063
     * BadConstructorReferenceError error class indicating that a constructor reference symbol has been found,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4064
     * but pointing to a class for which an enclosing instance is not available.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4065
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4066
    class BadConstructorReferenceError extends InvalidSymbolError {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4067
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4068
        public BadConstructorReferenceError(Symbol sym) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4069
            super(MISSING_ENCL, sym, "BadConstructorReferenceError");
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4070
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4071
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4072
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4073
        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4074
           return diags.create(dkind, log.currentSource(), pos,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4075
                "cant.access.inner.cls.constr", site.tsym.name, argtypes, site.getEnclosingType());
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4076
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4077
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4078
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4079
    /**
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4080
     * Helper class for method resolution diagnostic simplification.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4081
     * 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
  4082
     * 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
  4083
     * 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
  4084
     * 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
  4085
     * 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
  4086
     * 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
  4087
     * 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
  4088
     * the diagnostic to a simpler one.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4089
     */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4090
    static class MethodResolutionDiagHelper {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4091
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4092
        /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4093
         * 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
  4094
         * into a simpler one
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4095
         */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4096
        interface DiagnosticRewriter {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4097
            JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4098
                    DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4099
                    DiagnosticType preferredKind, JCDiagnostic d);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4100
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4101
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4102
        /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4103
         * 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
  4104
         * 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
  4105
         * for matching diagnostic arguments.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4106
         */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4107
        static class Template {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4108
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4109
            /** regex used to match diag key */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4110
            String regex;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4111
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4112
            /** templates used to match diagnostic args */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4113
            Template[] subTemplates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4114
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4115
            Template(String key, Template... subTemplates) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4116
                this.regex = key;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4117
                this.subTemplates = subTemplates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4118
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4119
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4120
            /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4121
             * 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
  4122
             * 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
  4123
             */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4124
            boolean matches(Object o) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4125
                JCDiagnostic d = (JCDiagnostic)o;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4126
                Object[] args = d.getArgs();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4127
                if (!d.getCode().matches(regex) ||
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4128
                        subTemplates.length != d.getArgs().length) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4129
                    return false;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4130
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4131
                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
  4132
                    if (!subTemplates[i].matches(args[i])) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4133
                        return false;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4134
                    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4135
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4136
                return true;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4137
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4138
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4139
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4140
        /**
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4141
         * Common rewriter for all argument mismatch simplifications.
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4142
         */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4143
        static class ArgMismatchRewriter implements DiagnosticRewriter {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4144
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4145
            /** the index of the subdiagnostic to be used as primary. */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4146
            int causeIndex;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4147
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4148
            public ArgMismatchRewriter(int causeIndex) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4149
                this.causeIndex = causeIndex;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4150
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4151
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4152
            @Override
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4153
            public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4154
                    DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4155
                    DiagnosticType preferredKind, JCDiagnostic d) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4156
                JCDiagnostic cause = (JCDiagnostic)d.getArgs()[causeIndex];
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4157
                return diags.create(preferredKind, preferredSource, d.getDiagnosticPosition(),
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4158
                        "prob.found.req", cause);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4159
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4160
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4161
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4162
        /** 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
  4163
        static final Template skip = new Template("") {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4164
            @Override
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4165
            boolean matches(Object d) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4166
                return true;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4167
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4168
        };
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4169
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4170
        /** template for matching inference-free arguments mismatch failures */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4171
        static final Template argMismatchTemplate = new Template(MethodCheckDiag.ARG_MISMATCH.regex(), skip);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4172
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4173
        /** template for matching inference related arguments mismatch failures */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4174
        static final Template inferArgMismatchTemplate = new Template(MethodCheckDiag.ARG_MISMATCH.regex(), skip, skip) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4175
            @Override
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4176
            boolean matches(Object o) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4177
                if (!super.matches(o)) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4178
                    return false;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4179
                }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4180
                JCDiagnostic d = (JCDiagnostic)o;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4181
                @SuppressWarnings("unchecked")
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4182
                List<Type> tvars = (List<Type>)d.getArgs()[0];
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4183
                return !containsAny(d, tvars);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4184
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4185
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4186
            BiPredicate<Object, List<Type>> containsPredicate = (o, ts) -> {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4187
                if (o instanceof Type) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4188
                    return ((Type)o).containsAny(ts);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4189
                } else if (o instanceof JCDiagnostic) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4190
                    return containsAny((JCDiagnostic)o, ts);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4191
                } else {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4192
                    return false;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4193
                }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4194
            };
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4195
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4196
            boolean containsAny(JCDiagnostic d, List<Type> ts) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4197
                return Stream.of(d.getArgs())
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4198
                        .anyMatch(o -> containsPredicate.test(o, ts));
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4199
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4200
        };
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4201
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4202
        /** rewriter map used for method resolution simplification */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  4203
        static final Map<Template, DiagnosticRewriter> rewriters = new LinkedHashMap<>();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4204
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4205
        static {
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4206
            rewriters.put(argMismatchTemplate, new ArgMismatchRewriter(0));
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4207
            rewriters.put(inferArgMismatchTemplate, new ArgMismatchRewriter(1));
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4208
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4209
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4210
        /**
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4211
         * Main entry point for diagnostic rewriting - given a diagnostic, see if any templates matches it,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4212
         * and rewrite it accordingly.
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4213
         */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4214
        static JCDiagnostic rewrite(JCDiagnostic.Factory diags, DiagnosticPosition pos, DiagnosticSource source,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4215
                                    DiagnosticType dkind, JCDiagnostic d) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4216
            for (Map.Entry<Template, DiagnosticRewriter> _entry : rewriters.entrySet()) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4217
                if (_entry.getKey().matches(d)) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4218
                    JCDiagnostic simpleDiag =
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4219
                            _entry.getValue().rewriteDiagnostic(diags, pos, source, dkind, d);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4220
                    simpleDiag.setFlag(DiagnosticFlag.COMPRESSED);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4221
                    return simpleDiag;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4222
                }
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4223
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4224
            return null;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4225
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4226
    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4227
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4228
    enum MethodResolutionPhase {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4229
        BASIC(false, false),
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4230
        BOX(true, false),
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4231
        VARARITY(true, true) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4232
            @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4233
            public Symbol mergeResults(Symbol bestSoFar, Symbol sym) {
26533
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4234
                //Check invariants (see {@code LookupHelper.shouldStop})
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  4235
                Assert.check(bestSoFar.kind.isResolutionError() && bestSoFar.kind != AMBIGUOUS);
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  4236
                if (!sym.kind.isResolutionError()) {
26533
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4237
                    //varargs resolution successful
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4238
                    return sym;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4239
                } else {
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4240
                    //pick best error
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4241
                    switch (bestSoFar.kind) {
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4242
                        case WRONG_MTH:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4243
                        case WRONG_MTHS:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4244
                            //Override previous errors if they were caused by argument mismatch.
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4245
                            //This generally means preferring current symbols - but we need to pay
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4246
                            //attention to the fact that the varargs lookup returns 'less' candidates
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4247
                            //than the previous rounds, and adjust that accordingly.
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4248
                            switch (sym.kind) {
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4249
                                case WRONG_MTH:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4250
                                    //if the previous round matched more than one method, return that
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4251
                                    //result instead
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4252
                                    return bestSoFar.kind == WRONG_MTHS ?
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4253
                                            bestSoFar : sym;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4254
                                case ABSENT_MTH:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4255
                                    //do not override erroneous symbol if the arity lookup did not
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4256
                                    //match any method
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4257
                                    return bestSoFar;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4258
                                case WRONG_MTHS:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4259
                                default:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4260
                                    //safe to override
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4261
                                    return sym;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4262
                            }
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4263
                        default:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4264
                            //otherwise, return first error
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4265
                            return bestSoFar;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4266
                    }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4267
                }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4268
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4269
        };
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4270
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
  4271
        final boolean isBoxingRequired;
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
  4272
        final boolean isVarargsRequired;
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4273
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4274
        MethodResolutionPhase(boolean isBoxingRequired, boolean isVarargsRequired) {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4275
           this.isBoxingRequired = isBoxingRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4276
           this.isVarargsRequired = isVarargsRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4277
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4278
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4279
        public boolean isBoxingRequired() {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4280
            return isBoxingRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4281
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4282
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4283
        public boolean isVarargsRequired() {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4284
            return isVarargsRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4285
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4286
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4287
        public Symbol mergeResults(Symbol prev, Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4288
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4289
        }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4290
    }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4291
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4292
    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
  4293
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4294
    /**
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4295
     * 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
  4296
     * overload resolution, such as list of method that are not applicable
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4297
     * (used to generate more precise diagnostics) and so on. Resolution contexts
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4298
     * 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
  4299
     * work within the resolution context it created.
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4300
     */
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4301
    class MethodResolutionContext {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4302
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4303
        private List<Candidate> candidates = List.nil();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4304
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4305
        MethodResolutionPhase step = null;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4306
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  4307
        MethodCheck methodCheck = resolveMethodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  4308
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4309
        private boolean internalResolution = false;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4310
        private DeferredAttr.AttrMode attrMode = DeferredAttr.AttrMode.SPECULATIVE;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4311
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4312
        void addInapplicableCandidate(Symbol sym, JCDiagnostic details) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4313
            Candidate c = new Candidate(currentResolutionContext.step, sym, details, null);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4314
            candidates = candidates.append(c);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4315
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4316
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4317
        void addApplicableCandidate(Symbol sym, Type mtype) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4318
            Candidate c = new Candidate(currentResolutionContext.step, sym, null, mtype);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4319
            candidates = candidates.append(c);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4320
        }
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  4321
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
  4322
        DeferredAttrContext deferredAttrContext(Symbol sym, InferenceContext inferenceContext, ResultInfo pendingResult, Warner warn) {
23132
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
  4323
            DeferredAttrContext parent = (pendingResult == null)
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
  4324
                ? deferredAttr.emptyDeferredAttrContext
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
  4325
                : pendingResult.checkContext.deferredAttrContext();
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
  4326
            return deferredAttr.new DeferredAttrContext(attrMode, sym, step,
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
  4327
                    inferenceContext, parent, warn);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  4328
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  4329
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4330
        /**
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4331
         * This class represents an overload resolution candidate. There are two
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4332
         * kinds of candidates: applicable methods and inapplicable methods;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4333
         * applicable methods have a pointer to the instantiated method type,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4334
         * while inapplicable candidates contain further details about the
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4335
         * reason why the method has been considered inapplicable.
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4336
         */
16301
b6fd735ea78e 6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents: 16294
diff changeset
  4337
        @SuppressWarnings("overrides")
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4338
        class Candidate {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4339
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4340
            final MethodResolutionPhase step;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4341
            final Symbol sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4342
            final JCDiagnostic details;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4343
            final Type mtype;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4344
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4345
            private Candidate(MethodResolutionPhase step, Symbol sym, JCDiagnostic details, Type mtype) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4346
                this.step = step;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4347
                this.sym = sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4348
                this.details = details;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4349
                this.mtype = mtype;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4350
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4351
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4352
            @Override
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4353
            public boolean equals(Object o) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4354
                if (o instanceof Candidate) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4355
                    Symbol s1 = this.sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4356
                    Symbol s2 = ((Candidate)o).sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4357
                    if  ((s1 != s2 &&
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4358
                            (s1.overrides(s2, s1.owner.type.tsym, types, false) ||
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4359
                            (s2.overrides(s1, s2.owner.type.tsym, types, false)))) ||
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4360
                            ((s1.isConstructor() || s2.isConstructor()) && s1.owner != s2.owner))
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4361
                        return true;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4362
                }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4363
                return false;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4364
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4365
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4366
            boolean isApplicable() {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4367
                return mtype != null;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4368
            }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4369
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4370
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4371
        DeferredAttr.AttrMode attrMode() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4372
            return attrMode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4373
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4374
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4375
        boolean internal() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4376
            return internalResolution;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4377
        }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4378
    }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4379
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4380
    MethodResolutionContext currentResolutionContext = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4381
}