src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
author darcy
Thu, 12 Jul 2018 14:13:15 -0700
changeset 51047 860a3648c494
parent 50898 12133a6e2613
child 55306 ea43db53de91
child 58678 9cf78a70fa4f
permissions -rw-r--r--
8028563: Remove javac support for 6/1.6 source and target values Reviewed-by: jjg, erikj, henryjen
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
49872
0798eab12791 8201281: Truncated error message with Incompatible : null
vromero
parents: 49579
diff changeset
     2
 * Copyright (c) 1999, 2018, 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;
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47942
diff changeset
    31
import com.sun.tools.javac.code.Source.Feature;
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
    32
import com.sun.tools.javac.code.Symbol.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    33
import com.sun.tools.javac.code.Type.*;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    34
import com.sun.tools.javac.comp.Attr.ResultInfo;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    35
import com.sun.tools.javac.comp.Check.CheckContext;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    36
import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    37
import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    38
import com.sun.tools.javac.comp.DeferredAttr.DeferredType;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
    39
import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
    40
import com.sun.tools.javac.comp.Resolve.MethodResolutionDiagHelper.Template;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
    41
import com.sun.tools.javac.comp.Resolve.ReferenceLookupResult.StaticKind;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
import com.sun.tools.javac.jvm.*;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
    43
import com.sun.tools.javac.main.Option;
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
    44
import com.sun.tools.javac.resources.CompilerProperties.Errors;
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
    45
import com.sun.tools.javac.resources.CompilerProperties.Fragments;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    46
import com.sun.tools.javac.tree.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    47
import com.sun.tools.javac.tree.JCTree.*;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
    48
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
    49
import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    50
import com.sun.tools.javac.util.*;
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
    51
import com.sun.tools.javac.util.DefinedBy.Api;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    52
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    53
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    54
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    55
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    56
import java.util.Arrays;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    57
import java.util.Collection;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    58
import java.util.EnumSet;
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
    59
import java.util.HashSet;
14052
8b839ae9074b 8000233: Fix issues in recent push
mcimadamore
parents: 14051
diff changeset
    60
import java.util.Iterator;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
    61
import java.util.LinkedHashMap;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    62
import java.util.Map;
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
    63
import java.util.Set;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
    64
import java.util.function.BiFunction;
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
    65
import java.util.function.BiPredicate;
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
    66
import java.util.function.Function;
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
    67
import java.util.function.Predicate;
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
    68
import java.util.stream.Stream;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    69
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    70
import javax.lang.model.element.ElementVisitor;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    71
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
import static com.sun.tools.javac.code.Flags.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
    73
import static com.sun.tools.javac.code.Flags.BLOCK;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
    74
import static com.sun.tools.javac.code.Flags.STATIC;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    75
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
    76
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
    77
import static com.sun.tools.javac.code.TypeTag.*;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
    78
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
    79
import static com.sun.tools.javac.tree.JCTree.Tag.*;
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
    80
import static com.sun.tools.javac.util.Iterators.createCompoundIterator;
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
    81
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
/** Helper class for name resolution, used mostly by the attribution phase.
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5846
diff changeset
    84
 *  <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
    85
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    88
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    89
public class Resolve {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
    90
    protected static final Context.Key<Resolve> resolveKey = new Context.Key<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    91
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1257
diff changeset
    92
    Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    93
    Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
    94
    Symtab syms;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
    95
    Attr attr;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
    96
    DeferredAttr deferredAttr;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    97
    Check chk;
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
    Infer infer;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24404
diff changeset
    99
    ClassFinder finder;
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
   100
    ModuleFinder moduleFinder;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
    Types types;
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
   102
    JCDiagnostic.Factory diags;
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
   103
    public final boolean allowFunctionalInterfaceMostSpecific;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   104
    public final boolean allowModules;
25435
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   105
    public final boolean checkVarargsAccessAfterResolution;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   106
    private final boolean compactMethodDiags;
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   107
    private final boolean allowLocalVariableTypeInference;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   108
    final EnumSet<VerboseResolutionMode> verboseResolutionMode;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   109
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
   110
    WriteableScope polymorphicSignatureScope;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
   111
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   112
    protected Resolve(Context context) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   113
        context.put(resolveKey, this);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   114
        syms = Symtab.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   115
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   116
        varNotFound = new SymbolNotFoundError(ABSENT_VAR);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   117
        methodNotFound = new SymbolNotFoundError(ABSENT_MTH);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   118
        typeNotFound = new SymbolNotFoundError(ABSENT_TYP);
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
   119
        referenceNotFound = ReferenceLookupResult.error(methodNotFound);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   120
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   121
        names = Names.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   122
        log = Log.instance(context);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   123
        attr = Attr.instance(context);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   124
        deferredAttr = DeferredAttr.instance(context);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   125
        chk = Check.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   126
        infer = Infer.instance(context);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24404
diff changeset
   127
        finder = ClassFinder.instance(context);
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
   128
        moduleFinder = ModuleFinder.instance(context);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   129
        types = Types.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   130
        diags = JCDiagnostic.Factory.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   131
        Source source = Source.instance(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   132
        Options options = Options.instance(context);
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   133
        compactMethodDiags = options.isSet(Option.XDIAGS, "compact") ||
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   134
                options.isUnset(Option.XDIAGS) && options.isUnset("rawDiagnostics");
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   135
        verboseResolutionMode = VerboseResolutionMode.getVerboseResolutionMode(options);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   136
        Target target = Target.instance(context);
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47942
diff changeset
   137
        allowFunctionalInterfaceMostSpecific = Feature.FUNCTIONAL_INTERFACE_MOST_SPECIFIC.allowedInSource(source);
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47942
diff changeset
   138
        allowLocalVariableTypeInference = Feature.LOCAL_VARIABLE_TYPE_INFERENCE.allowedInSource(source);
25435
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   139
        checkVarargsAccessAfterResolution =
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47942
diff changeset
   140
                Feature.POST_APPLICABILITY_VARARGS_ACCESS_CHECK.allowedInSource(source);
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
   141
        polymorphicSignatureScope = WriteableScope.create(syms.noSymbol);
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47942
diff changeset
   142
        allowModules = Feature.MODULES.allowedInSource(source);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   143
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   144
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   145
    /** error symbols, which are returned when resolution fails
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   146
     */
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   147
    private final SymbolNotFoundError varNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   148
    private final SymbolNotFoundError methodNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   149
    private final SymbolNotFoundError typeNotFound;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   150
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   151
    /** empty reference lookup result */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   152
    private final ReferenceLookupResult referenceNotFound;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
   153
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   154
    public static Resolve instance(Context context) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   155
        Resolve instance = context.get(resolveKey);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   156
        if (instance == null)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   157
            instance = new Resolve(context);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   158
        return instance;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   159
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   160
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   161
    private static Symbol bestOf(Symbol s1,
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   162
                                 Symbol s2) {
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   163
        return s1.kind.betterThan(s2.kind) ? s1 : s2;
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   164
    }
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   165
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   166
    // <editor-fold defaultstate="collapsed" desc="Verbose resolution diagnostics support">
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   167
    enum VerboseResolutionMode {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   168
        SUCCESS("success"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   169
        FAILURE("failure"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   170
        APPLICABLE("applicable"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   171
        INAPPLICABLE("inapplicable"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   172
        DEFERRED_INST("deferred-inference"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   173
        PREDEF("predef"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   174
        OBJECT_INIT("object-init"),
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   175
        INTERNAL("internal");
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   176
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
   177
        final String opt;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   178
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   179
        private VerboseResolutionMode(String opt) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   180
            this.opt = opt;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   181
        }
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
        static EnumSet<VerboseResolutionMode> getVerboseResolutionMode(Options opts) {
39599
3c7da4996d8c 8153407: javac, fold debug options
vromero
parents: 39092
diff changeset
   184
            String s = opts.get("debug.verboseResolution");
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   185
            EnumSet<VerboseResolutionMode> res = EnumSet.noneOf(VerboseResolutionMode.class);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   186
            if (s == null) return res;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   187
            if (s.contains("all")) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   188
                res = EnumSet.allOf(VerboseResolutionMode.class);
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
            Collection<String> args = Arrays.asList(s.split(","));
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   191
            for (VerboseResolutionMode mode : values()) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   192
                if (args.contains(mode.opt)) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   193
                    res.add(mode);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   194
                } else if (args.contains("-" + mode.opt)) {
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   195
                    res.remove(mode);
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   196
                }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   197
            }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   198
            return res;
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   199
        }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   200
    }
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
   201
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   202
    void reportVerboseResolutionDiagnostic(DiagnosticPosition dpos, Name name, Type site,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   203
            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
   204
        boolean success = !bestSoFar.kind.isResolutionError();
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   205
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   206
        if (success && !verboseResolutionMode.contains(VerboseResolutionMode.SUCCESS)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   207
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   208
        } else if (!success && !verboseResolutionMode.contains(VerboseResolutionMode.FAILURE)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   209
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   210
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   211
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   212
        if (bestSoFar.name == names.init &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   213
                bestSoFar.owner == syms.objectType.tsym &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   214
                !verboseResolutionMode.contains(VerboseResolutionMode.OBJECT_INIT)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   215
            return; //skip diags for Object constructor resolution
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   216
        } else if (site == syms.predefClass.type &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   217
                !verboseResolutionMode.contains(VerboseResolutionMode.PREDEF)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   218
            return; //skip spurious diags for predef symbols (i.e. operators)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   219
        } else if (currentResolutionContext.internalResolution &&
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   220
                !verboseResolutionMode.contains(VerboseResolutionMode.INTERNAL)) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   221
            return;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   222
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   223
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   224
        int pos = 0;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   225
        int mostSpecificPos = -1;
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19940
diff changeset
   226
        ListBuffer<JCDiagnostic> subDiags = new ListBuffer<>();
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   227
        for (Candidate c : currentResolutionContext.candidates) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   228
            if (currentResolutionContext.step != c.step ||
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   229
                    (c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.APPLICABLE)) ||
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   230
                    (!c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.INAPPLICABLE))) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   231
                continue;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   232
            } else {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   233
                subDiags.append(c.isApplicable() ?
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   234
                        getVerboseApplicableCandidateDiag(pos, c.sym, c.mtype) :
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   235
                        getVerboseInapplicableCandidateDiag(pos, c.sym, c.details));
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   236
                if (c.sym == bestSoFar)
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   237
                    mostSpecificPos = pos;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   238
                pos++;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   239
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   240
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   241
        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
   242
        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
   243
        JCDiagnostic main = diags.note(log.currentSource(), dpos, key, name,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   244
                site.tsym, mostSpecificPos, currentResolutionContext.step,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   245
                methodArguments(argtypes2),
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   246
                methodArguments(typeargtypes));
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   247
        JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, subDiags.toList());
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   248
        log.report(d);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   249
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   250
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   251
    JCDiagnostic getVerboseApplicableCandidateDiag(int pos, Symbol sym, Type inst) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   252
        JCDiagnostic subDiag = null;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   253
        if (sym.type.hasTag(FORALL)) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
   254
            subDiag = diags.fragment(Fragments.PartialInstSig(inst));
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   255
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   256
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   257
        String key = subDiag == null ?
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   258
                "applicable.method.found" :
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   259
                "applicable.method.found.1";
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   260
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   261
        return diags.fragment(key, pos, sym, subDiag);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   262
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   264
    JCDiagnostic getVerboseInapplicableCandidateDiag(int pos, Symbol sym, JCDiagnostic subDiag) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
   265
        return diags.fragment(Fragments.NotApplicableMethodFound(pos, sym, subDiag));
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   266
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
   267
    // </editor-fold>
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
/* ************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   270
 * Identifier resolution
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 "static" if its static level is greater than
06bc494ca11e Initial load
duke
parents:
diff changeset
   274
     *  the one of its outer environment
06bc494ca11e Initial load
duke
parents:
diff changeset
   275
     */
14056
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 14052
diff changeset
   276
    protected static boolean isStatic(Env<AttrContext> env) {
22440
d40c30326317 8028389: NullPointerException compiling annotation values that have bodies
alundblad
parents: 22167
diff changeset
   277
        return env.outer != null && env.info.staticLevel > env.outer.info.staticLevel;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   278
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   279
06bc494ca11e Initial load
duke
parents:
diff changeset
   280
    /** An environment is an "initializer" if it is a constructor or
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
     *  an instance initializer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   283
    static boolean isInitializer(Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   284
        Symbol owner = env.info.scope.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   285
        return owner.isConstructor() ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
            owner.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
            (owner.kind == VAR ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
             owner.kind == MTH && (owner.flags() & BLOCK) != 0) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   289
            (owner.flags() & STATIC) == 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
   290
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   291
06bc494ca11e Initial load
duke
parents:
diff changeset
   292
    /** Is class accessible in given evironment?
06bc494ca11e Initial load
duke
parents:
diff changeset
   293
     *  @param env    The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   294
     *  @param c      The class whose accessibility is checked.
06bc494ca11e Initial load
duke
parents:
diff changeset
   295
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   296
    public boolean isAccessible(Env<AttrContext> env, TypeSymbol c) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   297
        return isAccessible(env, c, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   298
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   299
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   300
    public boolean isAccessible(Env<AttrContext> env, TypeSymbol c, boolean checkInner) {
32951
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   301
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   302
        /* 15.9.5.1: Note that it is possible for the signature of the anonymous constructor
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   303
           to refer to an inaccessible type
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   304
        */
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   305
        if (env.enclMethod != null && (env.enclMethod.mods.flags & ANONCONSTR) != 0)
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   306
            return true;
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   307
43865
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   308
        if (env.info.visitingServiceImplementation &&
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   309
            env.toplevel.modle == c.packge().modle) {
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   310
            return true;
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   311
        }
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   312
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   313
        boolean isAccessible = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   314
        switch ((short)(c.flags() & AccessFlags)) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   315
            case PRIVATE:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   316
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   317
                    env.enclClass.sym.outermostClass() ==
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   318
                    c.owner.outermostClass();
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   319
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   320
            case 0:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   321
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   322
                    env.toplevel.packge == c.owner // fast special case
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   323
                    ||
32951
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   324
                    env.toplevel.packge == c.packge();
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   325
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   326
            default: // error recovery
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   327
                isAccessible = true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   328
                break;
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   329
            case PUBLIC:
43131
7769e4891d5e 8172411: -XDnoModules must be removed
jlahoda
parents: 42974
diff changeset
   330
                if (allowModules) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   331
                    ModuleSymbol currModule = env.toplevel.modle;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   332
                    currModule.complete();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   333
                    PackageSymbol p = c.packge();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   334
                    isAccessible =
44451
1619c00af9df 8177311: Denied access when named module accesses unreferences package from the unnamed module
jlahoda
parents: 43866
diff changeset
   335
                        currModule == p.modle ||
1619c00af9df 8177311: Denied access when named module accesses unreferences package from the unnamed module
jlahoda
parents: 43866
diff changeset
   336
                        currModule.visiblePackages.get(p.fullname) == p ||
1619c00af9df 8177311: Denied access when named module accesses unreferences package from the unnamed module
jlahoda
parents: 43866
diff changeset
   337
                        p == syms.rootPackage ||
1619c00af9df 8177311: Denied access when named module accesses unreferences package from the unnamed module
jlahoda
parents: 43866
diff changeset
   338
                        (p.modle == syms.unnamedModule && currModule.readModules.contains(p.modle));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   339
                } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   340
                    isAccessible = true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
   341
                }
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   342
                break;
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   343
            case PROTECTED:
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   344
                isAccessible =
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   345
                    env.toplevel.packge == c.owner // fast special case
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
                    env.toplevel.packge == c.packge()
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   348
                    ||
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   349
                    isInnerSubClass(env.enclClass.sym, c.owner);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   350
                break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   351
        }
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   352
        return (checkInner == false || c.type.getEnclosingType() == Type.noType) ?
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   353
            isAccessible :
7637
467bc8fc514e 6990134: minor (but red) findbugs warnings
jjg
parents: 7635
diff changeset
   354
            isAccessible && isAccessible(env, c.type.getEnclosingType(), checkInner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   355
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
    //where
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
        /** Is given class a subclass of given base class, or an inner class
06bc494ca11e Initial load
duke
parents:
diff changeset
   358
         *  of a subclass?
06bc494ca11e Initial load
duke
parents:
diff changeset
   359
         *  Return null if no such class exists.
06bc494ca11e Initial load
duke
parents:
diff changeset
   360
         *  @param c     The class which is the subclass or is contained in it.
06bc494ca11e Initial load
duke
parents:
diff changeset
   361
         *  @param base  The base class
06bc494ca11e Initial load
duke
parents:
diff changeset
   362
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   363
        private boolean isInnerSubClass(ClassSymbol c, Symbol base) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   364
            while (c != null && !c.isSubClass(base, types)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
                c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   367
            return c != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   368
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   369
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
    boolean isAccessible(Env<AttrContext> env, Type t) {
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   371
        return isAccessible(env, t, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   372
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   373
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   374
    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
   375
        return (t.hasTag(ARRAY))
24612
75dc732b45af 8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents: 24604
diff changeset
   376
            ? isAccessible(env, types.cvarUpperBound(types.elemtype(t)))
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   377
            : isAccessible(env, t.tsym, checkInner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   378
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   379
17998
02a5abb2ae2f 7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents: 17804
diff changeset
   380
    /** Is symbol accessible as a member of given type in given environment?
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
     *  @param env    The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   382
     *  @param site   The type of which the tested symbol is regarded
06bc494ca11e Initial load
duke
parents:
diff changeset
   383
     *                as a member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   384
     *  @param sym    The symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
    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
   387
        return isAccessible(env, site, sym, false);
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   388
    }
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   389
    public boolean isAccessible(Env<AttrContext> env, Type site, Symbol sym, boolean checkInner) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
        if (sym.name == names.init && sym.owner != site.tsym) return false;
32951
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   391
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   392
        /* 15.9.5.1: Note that it is possible for the signature of the anonymous constructor
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   393
           to refer to an inaccessible type
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   394
        */
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   395
        if (env.enclMethod != null && (env.enclMethod.mods.flags & ANONCONSTR) != 0)
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   396
            return true;
a098b538296c 8075799: Extraneous access checks implemented by javac
sadayapalam
parents: 32949
diff changeset
   397
43865
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   398
        if (env.info.visitingServiceImplementation &&
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   399
            env.toplevel.modle == sym.packge().modle) {
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   400
            return true;
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   401
        }
532c50fea155 8174243: incorrect error message for nested service provider
vromero
parents: 43272
diff changeset
   402
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   403
        switch ((short)(sym.flags() & AccessFlags)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   404
        case PRIVATE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   405
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   406
                (env.enclClass.sym == sym.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   407
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   408
                 env.enclClass.sym.outermostClass() ==
06bc494ca11e Initial load
duke
parents:
diff changeset
   409
                 sym.owner.outermostClass())
06bc494ca11e Initial load
duke
parents:
diff changeset
   410
                &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   411
                sym.isInheritedIn(site.tsym, types);
06bc494ca11e Initial load
duke
parents:
diff changeset
   412
        case 0:
06bc494ca11e Initial load
duke
parents:
diff changeset
   413
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   414
                (env.toplevel.packge == sym.owner.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   415
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   416
                 env.toplevel.packge == sym.packge())
06bc494ca11e Initial load
duke
parents:
diff changeset
   417
                &&
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   418
                isAccessible(env, site, checkInner)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   419
                &&
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   420
                sym.isInheritedIn(site.tsym, types)
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   421
                &&
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   422
                notOverriddenIn(site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   423
        case PROTECTED:
06bc494ca11e Initial load
duke
parents:
diff changeset
   424
            return
06bc494ca11e Initial load
duke
parents:
diff changeset
   425
                (env.toplevel.packge == sym.owner.owner // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
   426
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   427
                 env.toplevel.packge == sym.packge()
06bc494ca11e Initial load
duke
parents:
diff changeset
   428
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   429
                 isProtectedAccessible(sym, env.enclClass.sym, site)
06bc494ca11e Initial load
duke
parents:
diff changeset
   430
                 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   431
                 // OK to select instance method or field from 'super' or type name
06bc494ca11e Initial load
duke
parents:
diff changeset
   432
                 // (but type names should be disallowed elsewhere!)
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
                 env.info.selectSuper && (sym.flags() & STATIC) == 0 && sym.kind != TYP)
06bc494ca11e Initial load
duke
parents:
diff changeset
   434
                &&
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   435
                isAccessible(env, site, checkInner)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   436
                &&
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   437
                notOverriddenIn(site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   438
        default: // this case includes erroneous combinations as well
7209
889e80aa1d2e 6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents: 6721
diff changeset
   439
            return isAccessible(env, site, checkInner) && notOverriddenIn(site, sym);
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   440
        }
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   441
    }
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   442
    //where
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   443
    /* `sym' is accessible only if not overridden by
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   444
     * another symbol which is a member of `site'
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   445
     * (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
   446
     * 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
   447
     * cannot be overridden (e.g. MH.invokeExact(Object[])).
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   448
     */
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   449
    private boolean notOverriddenIn(Type site, Symbol sym) {
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   450
        if (sym.kind != MTH || sym.isConstructor() || sym.isStatic())
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   451
            return true;
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   452
        else {
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
   453
            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
   454
            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
   455
                    !types.isSubSignature(types.memberType(site, s2), types.memberType(site, sym)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   456
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   457
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   458
    //where
06bc494ca11e Initial load
duke
parents:
diff changeset
   459
        /** Is given protected symbol accessible if it is selected from given site
06bc494ca11e Initial load
duke
parents:
diff changeset
   460
         *  and the selection takes place in given class?
06bc494ca11e Initial load
duke
parents:
diff changeset
   461
         *  @param sym     The symbol with protected access
06bc494ca11e Initial load
duke
parents:
diff changeset
   462
         *  @param c       The class where the access takes place
06bc494ca11e Initial load
duke
parents:
diff changeset
   463
         *  @site          The type of the qualifier
06bc494ca11e Initial load
duke
parents:
diff changeset
   464
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   465
        private
06bc494ca11e Initial load
duke
parents:
diff changeset
   466
        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
   467
            Type newSite = site.hasTag(TYPEVAR) ? site.getUpperBound() : site;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   468
            while (c != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   469
                   !(c.isSubClass(sym.owner, types) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   470
                     (c.flags() & INTERFACE) == 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   471
                     // In JLS 2e 6.6.2.1, the subclass restriction applies
06bc494ca11e Initial load
duke
parents:
diff changeset
   472
                     // only to instance fields and methods -- types are excluded
06bc494ca11e Initial load
duke
parents:
diff changeset
   473
                     // 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
   474
                     ((sym.flags() & STATIC) != 0 || sym.kind == TYP || newSite.tsym.isSubClass(c, types))))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   475
                c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   476
            return c != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   477
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   478
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   479
    /**
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   480
     * Performs a recursive scan of a type looking for accessibility problems
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   481
     * from current attribution environment
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   482
     */
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   483
    void checkAccessibleType(Env<AttrContext> env, Type t) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   484
        accessibilityChecker.visit(t, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   485
    }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   486
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   487
    /**
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   488
     * Accessibility type-visitor
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   489
     */
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   490
    Types.SimpleVisitor<Void, Env<AttrContext>> accessibilityChecker =
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   491
            new Types.SimpleVisitor<Void, Env<AttrContext>>() {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   492
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   493
        void visit(List<Type> ts, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   494
            for (Type t : ts) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   495
                visit(t, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   496
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   497
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   498
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   499
        public Void visitType(Type t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   500
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   501
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   502
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   503
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   504
        public Void visitArrayType(ArrayType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   505
            visit(t.elemtype, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   506
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   507
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   508
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   509
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   510
        public Void visitClassType(ClassType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   511
            visit(t.getTypeArguments(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   512
            if (!isAccessible(env, t, true)) {
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
   513
                accessBase(new AccessError(env, null, t.tsym), env.tree.pos(), env.enclClass.sym, t, t.tsym.name, true);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   514
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   515
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   516
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   517
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   518
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   519
        public Void visitWildcardType(WildcardType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   520
            visit(t.type, env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   521
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   522
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   523
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   524
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   525
        public Void visitMethodType(MethodType t, Env<AttrContext> env) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   526
            visit(t.getParameterTypes(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   527
            visit(t.getReturnType(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   528
            visit(t.getThrownTypes(), env);
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   529
            return null;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   530
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   531
    };
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   532
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   533
    /** 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
   534
     *  given type arguments and argument types. If successful, return
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   535
     *  the method's instantiated type, else return null.
06bc494ca11e Initial load
duke
parents:
diff changeset
   536
     *  The instantiation will take into account an additional leading
06bc494ca11e Initial load
duke
parents:
diff changeset
   537
     *  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
   538
     *  of an under determined site. In this case, we treat site as an additional
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   539
     *  parameter and the parameters of the class containing the method as
06bc494ca11e Initial load
duke
parents:
diff changeset
   540
     *  additional type variables that get instantiated.
06bc494ca11e Initial load
duke
parents:
diff changeset
   541
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   542
     *  @param env         The current environment
06bc494ca11e Initial load
duke
parents:
diff changeset
   543
     *  @param site        The type of which the method is a member.
06bc494ca11e Initial load
duke
parents:
diff changeset
   544
     *  @param m           The method symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   545
     *  @param argtypes    The invocation's given value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   546
     *  @param typeargtypes    The invocation's given type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   547
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
    Type rawInstantiate(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
   551
                        Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
   552
                        Symbol m,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   553
                        ResultInfo resultInfo,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
                        List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   555
                        List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   556
                        boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
                        boolean useVarargs,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
   558
                        Warner warn) throws Infer.InferenceException {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   559
        Type mt = types.memberType(site, m);
06bc494ca11e Initial load
duke
parents:
diff changeset
   560
        // tvars is the list of formal type variables for which type arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
   561
        // need to inferred.
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   562
        List<Type> tvars = List.nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   563
        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
   564
        if (!mt.hasTag(FORALL) && typeargtypes.nonEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   565
            // 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
   566
            // 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
   567
        } else if (mt.hasTag(FORALL) && typeargtypes.nonEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   568
            ForAll pmt = (ForAll) mt;
06bc494ca11e Initial load
duke
parents:
diff changeset
   569
            if (typeargtypes.length() != pmt.tvars.length())
41943
a4ee110842fb 8169093: Generics, javac not matching actual and formal arguments.
mcimadamore
parents: 41932
diff changeset
   570
                 // not enough args
49876
ac916fea6ec7 8202157: remove the use of string keys at InapplicableMethodException
vromero
parents: 49872
diff changeset
   571
                throw new InapplicableMethodException(diags.fragment(Fragments.WrongNumberTypeArgs(Integer.toString(pmt.tvars.length()))));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   572
            // Check type arguments are within bounds
06bc494ca11e Initial load
duke
parents:
diff changeset
   573
            List<Type> formals = pmt.tvars;
06bc494ca11e Initial load
duke
parents:
diff changeset
   574
            List<Type> actuals = typeargtypes;
06bc494ca11e Initial load
duke
parents:
diff changeset
   575
            while (formals.nonEmpty() && actuals.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   576
                List<Type> bounds = types.subst(types.getBounds((TypeVar)formals.head),
06bc494ca11e Initial load
duke
parents:
diff changeset
   577
                                                pmt.tvars, typeargtypes);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   578
                for (; bounds.nonEmpty(); bounds = bounds.tail) {
49876
ac916fea6ec7 8202157: remove the use of string keys at InapplicableMethodException
vromero
parents: 49872
diff changeset
   579
                    if (!types.isSubtypeUnchecked(actuals.head, bounds.head, warn)) {
ac916fea6ec7 8202157: remove the use of string keys at InapplicableMethodException
vromero
parents: 49872
diff changeset
   580
                        throw new InapplicableMethodException(diags.fragment(Fragments.ExplicitParamDoNotConformToBounds(actuals.head, bounds)));
ac916fea6ec7 8202157: remove the use of string keys at InapplicableMethodException
vromero
parents: 49872
diff changeset
   581
                    }
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   582
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   583
                formals = formals.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   584
                actuals = actuals.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   585
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   586
            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
   587
        } else if (mt.hasTag(FORALL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   588
            ForAll pmt = (ForAll) mt;
06bc494ca11e Initial load
duke
parents:
diff changeset
   589
            List<Type> tvars1 = types.newInstances(pmt.tvars);
06bc494ca11e Initial load
duke
parents:
diff changeset
   590
            tvars = tvars.appendList(tvars1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   591
            mt = types.subst(pmt.qtype, pmt.tvars, tvars1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   592
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   593
06bc494ca11e Initial load
duke
parents:
diff changeset
   594
        // 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
   595
        boolean instNeeded = tvars.tail != null; /*inlined: tvars.nonEmpty()*/
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   596
        for (List<Type> l = argtypes;
06bc494ca11e Initial load
duke
parents:
diff changeset
   597
             l.tail != null/*inlined: l.nonEmpty()*/ && !instNeeded;
06bc494ca11e Initial load
duke
parents:
diff changeset
   598
             l = l.tail) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
   599
            if (l.head.hasTag(FORALL)) instNeeded = true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   600
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   601
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   602
        if (instNeeded) {
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
   603
            return infer.instantiateMethod(env,
5489
e7af65bf7577 6730476: invalid "unchecked generic array" warning
mcimadamore
parents: 5321
diff changeset
   604
                                    tvars,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   605
                                    (MethodType)mt,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   606
                                    resultInfo,
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   607
                                    (MethodSymbol)m,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   608
                                    argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   609
                                    allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   610
                                    useVarargs,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   611
                                    currentResolutionContext,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   612
                                    warn);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
   613
        }
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   614
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
   615
        DeferredAttr.DeferredAttrContext dc = currentResolutionContext.deferredAttrContext(m, infer.emptyContext, resultInfo, warn);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
   616
        currentResolutionContext.methodCheck.argumentsAcceptable(env, dc,
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   617
                                argtypes, mt.getParameterTypes(), warn);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
   618
        dc.complete();
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   619
        return mt;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   620
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   621
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   622
    Type checkMethod(Env<AttrContext> env,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   623
                     Type site,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   624
                     Symbol m,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   625
                     ResultInfo resultInfo,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   626
                     List<Type> argtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   627
                     List<Type> typeargtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   628
                     Warner warn) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   629
        MethodResolutionContext prevContext = currentResolutionContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   630
        try {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   631
            currentResolutionContext = new MethodResolutionContext();
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
   632
            currentResolutionContext.attrMode = (resultInfo.pt == Infer.anyPoly) ?
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
   633
                    AttrMode.SPECULATIVE : DeferredAttr.AttrMode.CHECK;
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   634
            if (env.tree.hasTag(JCTree.Tag.REFERENCE)) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   635
                //method/constructor references need special check class
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   636
                //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
   637
                //during an unsticking round)
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   638
                currentResolutionContext.methodCheck =
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   639
                        new MethodReferenceCheck(resultInfo.checkContext.inferenceContext());
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   640
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   641
            MethodResolutionPhase step = currentResolutionContext.step = env.info.pendingResolutionPhase;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   642
            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
   643
                    step.isBoxingRequired(), step.isVarargsRequired(), warn);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   644
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   645
        finally {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   646
            currentResolutionContext = prevContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   647
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   648
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
   649
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   650
    /** Same but returns null instead throwing a NoInstanceException
06bc494ca11e Initial load
duke
parents:
diff changeset
   651
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   652
    Type instantiate(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
   653
                     Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
   654
                     Symbol m,
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   655
                     ResultInfo resultInfo,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   656
                     List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   657
                     List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   658
                     boolean allowBoxing,
06bc494ca11e Initial load
duke
parents:
diff changeset
   659
                     boolean useVarargs,
06bc494ca11e Initial load
duke
parents:
diff changeset
   660
                     Warner warn) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   661
        try {
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
   662
            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
   663
                                  allowBoxing, useVarargs, warn);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   664
        } catch (InapplicableMethodException ex) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   665
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   666
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   667
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   668
15037
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
     * 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
   671
     * 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
   672
     * 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
   673
     * 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
   674
     * this interfaces allows to easily add new pluggable method check routines.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   675
     */
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   676
    interface MethodCheck {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   677
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   678
         * 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
   679
         * 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
   680
         * 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
   681
         * is assumed to be thrown.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   682
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   683
        void argumentsAcceptable(Env<AttrContext> env,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   684
                                DeferredAttrContext deferredAttrContext,
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
   685
                                List<Type> argtypes,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   686
                                List<Type> formals,
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   687
                                Warner warn);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   688
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   689
        /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   690
         * 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
   691
         * most specific check.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   692
         */
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   693
        MethodCheck mostSpecificCheck(List<Type> actuals);
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   694
    }
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   695
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   696
    /**
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   697
     * Helper enum defining all method check diagnostics (used by resolveMethodCheck).
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   698
     */
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   699
    enum MethodCheckDiag {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   700
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   701
         * Actuals and formals differs in length.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   702
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   703
        ARITY_MISMATCH("arg.length.mismatch", "infer.arg.length.mismatch"),
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   704
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   705
         * An actual is incompatible with a formal.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   706
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   707
        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
   708
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   709
         * An actual is incompatible with the varargs element type.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   710
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   711
        VARARG_MISMATCH("varargs.argument.mismatch", "infer.varargs.argument.mismatch"),
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   712
        /**
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   713
         * The varargs element type is inaccessible.
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   714
         */
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   715
        INACCESSIBLE_VARARGS("inaccessible.varargs.type", "inaccessible.varargs.type");
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   716
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   717
        final String basicKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   718
        final String inferKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   719
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   720
        MethodCheckDiag(String basicKey, String inferKey) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   721
            this.basicKey = basicKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   722
            this.inferKey = inferKey;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   723
        }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   724
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   725
        String regex() {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   726
            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
   727
        }
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   728
    }
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   729
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   730
    /**
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   731
     * 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
   732
     * of their formal parameter types.
11707
532f41763bc9 7129801: Merge the two method applicability routines
mcimadamore
parents: 10950
diff changeset
   733
     */
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   734
    MethodCheck nilMethodCheck = new MethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   735
        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
   736
            //do nothing - method always applicable regardless of actuals
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   737
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   738
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   739
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   740
            return this;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   741
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   742
    };
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   743
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   744
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   745
     * 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
   746
     * 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
   747
     * 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
   748
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   749
    abstract class AbstractMethodCheck implements MethodCheck {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   750
        @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   751
        public void argumentsAcceptable(final Env<AttrContext> env,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   752
                                    DeferredAttrContext deferredAttrContext,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   753
                                    List<Type> argtypes,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   754
                                    List<Type> formals,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   755
                                    Warner warn) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   756
            //should we expand formals?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   757
            boolean useVarargs = deferredAttrContext.phase.isVarargsRequired();
34854
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   758
            JCTree callTree = treeForDiagnostics(env);
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   759
            List<JCExpression> trees = TreeInfo.args(callTree);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   760
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   761
            //inference context used during this method check
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   762
            InferenceContext inferenceContext = deferredAttrContext.inferenceContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   763
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   764
            Type varargsFormal = useVarargs ? formals.last() : null;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   765
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   766
            if (varargsFormal == null &&
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   767
                    argtypes.size() != formals.size()) {
34854
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   768
                reportMC(callTree, MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   769
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   770
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   771
            while (argtypes.nonEmpty() && formals.head != varargsFormal) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   772
                DiagnosticPosition pos = trees != null ? trees.head : null;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   773
                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
   774
                argtypes = argtypes.tail;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   775
                formals = formals.tail;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   776
                trees = trees != null ? trees.tail : trees;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
   777
            }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   778
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   779
            if (formals.head != varargsFormal) {
34854
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   780
                reportMC(callTree, MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   781
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   782
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   783
            if (useVarargs) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   784
                //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
   785
                //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
   786
                final Type elt = types.elemtype(varargsFormal);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   787
                while (argtypes.nonEmpty()) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   788
                    DiagnosticPosition pos = trees != null ? trees.head : null;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   789
                    checkArg(pos, true, argtypes.head, elt, deferredAttrContext, warn);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   790
                    argtypes = argtypes.tail;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   791
                    trees = trees != null ? trees.tail : trees;
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
   792
                }
8229
39266c1b1b0e 6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents: 8228
diff changeset
   793
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   794
        }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   795
34854
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   796
            // where
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   797
            private JCTree treeForDiagnostics(Env<AttrContext> env) {
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   798
                return env.info.preferredTreeForDiagnostics != null ? env.info.preferredTreeForDiagnostics : env.tree;
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   799
            }
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
   800
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   801
        /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   802
         * 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
   803
         */
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   804
        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
   805
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   806
        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
   807
            boolean inferDiag = inferenceContext != infer.emptyContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   808
            if (inferDiag && (!diag.inferKey.equals(diag.basicKey))) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   809
                Object[] args2 = new Object[args.length + 1];
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   810
                System.arraycopy(args, 0, args2, 1, args.length);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   811
                args2[0] = inferenceContext.inferenceVars();
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   812
                args = args2;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   813
            }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   814
            String key = inferDiag ? diag.inferKey : diag.basicKey;
49872
0798eab12791 8201281: Truncated error message with Incompatible : null
vromero
parents: 49579
diff changeset
   815
            throw inferDiag ?
0798eab12791 8201281: Truncated error message with Incompatible : null
vromero
parents: 49579
diff changeset
   816
                infer.error(diags.create(DiagnosticType.FRAGMENT, log.currentSource(), pos, key, args)) :
50592
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   817
                methodCheckFailure.setMessage(diags.create(DiagnosticType.FRAGMENT, log.currentSource(), pos, key, args));
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   818
        }
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   819
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   820
        /**
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   821
         * To eliminate the overhead associated with allocating an exception object in such an
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   822
         * hot execution path, we use flyweight pattern - and share the same exception instance
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   823
         * across multiple method check failures.
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   824
         */
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   825
        class SharedInapplicableMethodException extends InapplicableMethodException {
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   826
            private static final long serialVersionUID = 0;
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   827
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   828
            SharedInapplicableMethodException() {
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   829
                super(null);
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   830
            }
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   831
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   832
            SharedInapplicableMethodException setMessage(JCDiagnostic details) {
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   833
                this.diagnostic = details;
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   834
                return this;
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   835
            }
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   836
        }
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   837
dddf078c242f 8203838: javac performance regression in 11+11
mcimadamore
parents: 50539
diff changeset
   838
        SharedInapplicableMethodException methodCheckFailure = new SharedInapplicableMethodException();
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   839
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   840
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   841
            return nilMethodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   842
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   843
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   844
    }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   845
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   846
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   847
     * 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
   848
     * supplied conforms to the method signature.
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   849
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   850
    MethodCheck arityMethodCheck = new AbstractMethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   851
        @Override
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   852
        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
   853
            //do nothing - actual always compatible to formals
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   854
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   855
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   856
        @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   857
        public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   858
            return "arityMethodCheck";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   859
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   860
    };
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   861
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   862
    /**
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   863
     * 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
   864
     * 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
   865
     * 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
   866
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   867
     * 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
   868
     * 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
   869
     * 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
   870
     * 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
   871
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   872
     * 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
   873
     * 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
   874
     * 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
   875
     * 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
   876
     * 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
   877
     *
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   878
     * 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
   879
     */
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   880
    MethodCheck resolveMethodCheck = new AbstractMethodCheck() {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   881
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   882
        @Override
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   883
        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
   884
            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
   885
            mresult.check(pos, actual);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   886
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   887
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   888
        @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   889
        public void argumentsAcceptable(final Env<AttrContext> env,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   890
                                    DeferredAttrContext deferredAttrContext,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   891
                                    List<Type> argtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   892
                                    List<Type> formals,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   893
                                    Warner warn) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   894
            super.argumentsAcceptable(env, deferredAttrContext, argtypes, formals, warn);
29958
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   895
            // should we check varargs element type accessibility?
25435
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   896
            if (deferredAttrContext.phase.isVarargsRequired()) {
29958
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   897
                if (deferredAttrContext.mode == AttrMode.CHECK || !checkVarargsAccessAfterResolution) {
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   898
                    varargsAccessible(env, types.elemtype(formals.last()), deferredAttrContext.inferenceContext);
25435
928866794984 8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents: 25279
diff changeset
   899
                }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   900
            }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   901
        }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   902
29958
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   903
        /**
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   904
         * Test that the runtime array element type corresponding to 't' is accessible.  't' should be the
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   905
         * varargs element type of either the method invocation type signature (after inference completes)
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   906
         * or the method declaration signature (before inference completes).
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   907
         */
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   908
        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
   909
            if (inferenceContext.free(t)) {
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
   910
                inferenceContext.addFreeTypeListener(List.of(t),
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
   911
                        solvedContext -> varargsAccessible(env, solvedContext.asInstType(t), solvedContext));
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   912
            } else {
29958
3463809fbb52 8075520: Varargs access check mishandles capture variables
dlsmith
parents: 29776
diff changeset
   913
                if (!isAccessible(env, types.erasure(t))) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   914
                    Symbol location = env.enclClass.sym;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
   915
                    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
   916
                }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   917
            }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   918
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   919
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   920
        private ResultInfo methodCheckResult(final boolean varargsCheck, Type to,
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   921
                final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   922
            CheckContext checkContext = new MethodCheckContext(!deferredAttrContext.phase.isBoxingRequired(), deferredAttrContext, rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   923
                MethodCheckDiag methodDiag = varargsCheck ?
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   924
                                 MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   925
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   926
                @Override
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   927
                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
   928
                    reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   929
                }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   930
            };
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   931
            return new MethodResultInfo(to, checkContext);
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   932
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
   933
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
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);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
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 "resolveMethodCheck";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   942
        }
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
   943
    };
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   944
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   945
    /**
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   946
     * This class handles method reference applicability checks; since during
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   947
     * 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
   948
     * 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
   949
     * extended so that inference variables are 'opened' as needed.
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
   950
     */
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   951
    class MethodReferenceCheck extends AbstractMethodCheck {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   952
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   953
        InferenceContext pendingInferenceContext;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   954
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   955
        MethodReferenceCheck(InferenceContext pendingInferenceContext) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   956
            this.pendingInferenceContext = pendingInferenceContext;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   957
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   958
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   959
        @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   960
        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
   961
            ResultInfo mresult = methodCheckResult(varargs, formal, deferredAttrContext, warn);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   962
            mresult.check(pos, actual);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   963
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   964
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   965
        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
   966
                final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   967
            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
   968
                MethodCheckDiag methodDiag = varargsCheck ?
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   969
                                 MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH;
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   970
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   971
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   972
                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
   973
                    found = pendingInferenceContext.asUndetVar(found);
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   974
                    if (found.hasTag(UNDETVAR) && req.isPrimitive()) {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   975
                        req = types.boxedClass(req).type;
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   976
                    }
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   977
                    return super.compatible(found, req, warn);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   978
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   979
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   980
                @Override
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   981
                public void report(DiagnosticPosition pos, JCDiagnostic details) {
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   982
                    reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   983
                }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   984
            };
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   985
            return new MethodResultInfo(to, checkContext);
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   986
        }
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   987
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   988
        @Override
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   989
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
   990
            return new MostSpecificCheck(actuals);
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   991
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   992
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   993
        @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   994
        public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   995
            return "MethodReferenceCheck";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
   996
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
   997
    }
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
   998
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
   999
    /**
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1000
     * 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
  1001
     * context might contain inference variables.
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1002
     */
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1003
    abstract class MethodCheckContext implements CheckContext {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1004
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1005
        boolean strict;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1006
        DeferredAttrContext deferredAttrContext;
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1007
        Warner rsWarner;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1008
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1009
        public MethodCheckContext(boolean strict, DeferredAttrContext deferredAttrContext, Warner rsWarner) {
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1010
           this.strict = strict;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1011
           this.deferredAttrContext = deferredAttrContext;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1012
           this.rsWarner = rsWarner;
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1013
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1014
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1015
        public boolean compatible(Type found, Type req, Warner warn) {
25279
a665d5cbb8c3 8044546: Crash on faulty reduce/lambda
vromero
parents: 25008
diff changeset
  1016
            InferenceContext inferenceContext = deferredAttrContext.inferenceContext;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1017
            return strict ?
25279
a665d5cbb8c3 8044546: Crash on faulty reduce/lambda
vromero
parents: 25008
diff changeset
  1018
                    types.isSubtypeUnchecked(inferenceContext.asUndetVar(found), inferenceContext.asUndetVar(req), warn) :
a665d5cbb8c3 8044546: Crash on faulty reduce/lambda
vromero
parents: 25008
diff changeset
  1019
                    types.isConvertible(inferenceContext.asUndetVar(found), inferenceContext.asUndetVar(req), warn);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1020
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1021
13438
83729994273a 7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents: 12915
diff changeset
  1022
        public void report(DiagnosticPosition pos, JCDiagnostic details) {
49876
ac916fea6ec7 8202157: remove the use of string keys at InapplicableMethodException
vromero
parents: 49872
diff changeset
  1023
            throw new InapplicableMethodException(details);
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1024
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1025
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1026
        public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1027
            return rsWarner;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1028
        }
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1029
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1030
        public InferenceContext inferenceContext() {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1031
            return deferredAttrContext.inferenceContext;
14047
7c7a5611cf76 7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents: 14045
diff changeset
  1032
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1033
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1034
        public DeferredAttrContext deferredAttrContext() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1035
            return deferredAttrContext;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1036
        }
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1037
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1038
        @Override
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1039
        public String toString() {
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1040
            return "MethodCheckContext";
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1041
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1042
    }
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1043
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1044
    /**
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1045
     * 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
  1046
     * for deferred types goes through special path.
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1047
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1048
    class MethodResultInfo extends ResultInfo {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1049
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1050
        public MethodResultInfo(Type pt, CheckContext checkContext) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1051
            attr.super(KindSelector.VAL, pt, checkContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1052
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1053
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1054
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1055
        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
  1056
            if (found.hasTag(DEFERRED)) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1057
                DeferredType dt = (DeferredType)found;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1058
                return dt.check(this);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1059
            } else {
28336
9a6ae3c3efb5 8066871: java.lang.VerifyError: Bad local variable type - local final String
mcimadamore
parents: 28331
diff changeset
  1060
                Type uResult = U(found);
24226
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1061
                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
  1062
                        types.capture(uResult) :
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1063
                        checkContext.inferenceContext()
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1064
                            .cachedCapture(pos.getTree(), uResult, true);
08b586e22328 8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents: 23132
diff changeset
  1065
                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
  1066
            }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1067
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1068
18911
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1069
        /**
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1070
         * javac has a long-standing 'simplification' (see 6391995):
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1071
         * given an actual argument type, the method check is performed
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1072
         * on its upper bound. This leads to inconsistencies when an
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1073
         * argument type is checked against itself. For example, given
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1074
         * 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
  1075
         * so we need to guard against that.
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1076
         */
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1077
        private Type U(Type found) {
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1078
            return found == pt ?
24612
75dc732b45af 8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents: 24604
diff changeset
  1079
                    found : types.cvarUpperBound(found);
18911
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1080
        }
dcc1e26a8c9c 8012238: Nested method capture and inference
mcimadamore
parents: 18910
diff changeset
  1081
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1082
        @Override
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1083
        protected MethodResultInfo dup(Type newPt) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1084
            return new MethodResultInfo(newPt, checkContext);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1085
        }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1086
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1087
        @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  1088
        protected ResultInfo dup(CheckContext newContext) {
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1089
            return new MethodResultInfo(pt, newContext);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  1090
        }
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1091
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1092
        @Override
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1093
        protected ResultInfo dup(Type newPt, CheckContext newContext) {
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1094
            return new MethodResultInfo(newPt, newContext);
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1095
        }
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1096
    }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1097
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1098
    /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1099
     * 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
  1100
     * 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
  1101
     * 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
  1102
     * argument types A.
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1103
     */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1104
    class MostSpecificCheck implements MethodCheck {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1105
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1106
        List<Type> actuals;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1107
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1108
        MostSpecificCheck(List<Type> actuals) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1109
            this.actuals = actuals;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1110
        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1111
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1112
        @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1113
        public void argumentsAcceptable(final Env<AttrContext> env,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1114
                                    DeferredAttrContext deferredAttrContext,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1115
                                    List<Type> formals1,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1116
                                    List<Type> formals2,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1117
                                    Warner warn) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1118
            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
  1119
            while (formals2.nonEmpty()) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1120
                ResultInfo mresult = methodCheckResult(formals2.head, deferredAttrContext, warn, actuals.head);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1121
                mresult.check(null, formals1.head);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1122
                formals1 = formals1.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1123
                formals2 = formals2.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1124
                actuals = actuals.isEmpty() ? actuals : actuals.tail;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1125
            }
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
       /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1129
        * 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
  1130
        */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1131
        ResultInfo methodCheckResult(Type to, DeferredAttr.DeferredAttrContext deferredAttrContext,
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1132
               Warner rsWarner, Type actual) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1133
            return attr.new ResultInfo(KindSelector.VAL, to,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1134
                   new MostSpecificCheckContext(deferredAttrContext, rsWarner, actual));
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1135
        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1136
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1137
        /**
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1138
         * 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
  1139
         * 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
  1140
         * a full blown structural analysis is carried out.
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1141
         */
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1142
        class MostSpecificCheckContext extends MethodCheckContext {
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
            Type actual;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1145
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1146
            public MostSpecificCheckContext(DeferredAttrContext deferredAttrContext, Warner rsWarner, Type actual) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1147
                super(true, deferredAttrContext, rsWarner);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1148
                this.actual = actual;
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
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1151
            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
  1152
                if (allowFunctionalInterfaceMostSpecific &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1153
                        unrelatedFunctionalInterfaces(found, req) &&
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1154
                        (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
  1155
                    DeferredType dt = (DeferredType) actual;
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1156
                    JCTree speculativeTree = dt.speculativeTree(deferredAttrContext);
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1157
                    if (speculativeTree != deferredAttr.stuckTree) {
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1158
                        return functionalInterfaceMostSpecific(found, req, speculativeTree);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1159
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1160
                }
29146
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1161
                return compatibleBySubtyping(found, req);
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1162
            }
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1163
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1164
            private boolean compatibleBySubtyping(Type found, Type req) {
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1165
                if (!strict && found.isPrimitive() != req.isPrimitive()) {
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1166
                    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
  1167
                }
7115a5967ed1 8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents: 29051
diff changeset
  1168
                return types.isSubtypeNoCapture(found, deferredAttrContext.inferenceContext.asUndetVar(req));
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1169
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1170
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1171
            /** 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
  1172
            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
  1173
                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
  1174
                       types.isFunctionalInterface(s.tsym) &&
38914
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1175
                       unrelatedInterfaces(t, s);
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1176
            }
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1177
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1178
            /** Whether {@code t} and {@code s} are unrelated interface types; recurs on intersections. **/
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1179
            private boolean unrelatedInterfaces(Type t, Type s) {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1180
                if (t.isCompound()) {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1181
                    for (Type ti : types.interfaces(t)) {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1182
                        if (!unrelatedInterfaces(ti, s)) {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1183
                            return false;
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1184
                        }
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1185
                    }
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1186
                    return true;
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1187
                } else if (s.isCompound()) {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1188
                    for (Type si : types.interfaces(s)) {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1189
                        if (!unrelatedInterfaces(t, si)) {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1190
                            return false;
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1191
                        }
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1192
                    }
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1193
                    return true;
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1194
                } else {
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1195
                    return types.asSuper(t, s.tsym) == null && types.asSuper(s, t.tsym) == null;
2f652b30f1b0 8037804: Implement specified test for related functional interface types
dlsmith
parents: 38913
diff changeset
  1196
                }
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1197
            }
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1198
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1199
            /** 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
  1200
            private boolean functionalInterfaceMostSpecific(Type t, Type s, JCTree tree) {
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1201
                Type tDesc = types.findDescriptorType(types.capture(t));
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1202
                Type tDescNoCapture = types.findDescriptorType(t);
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1203
                Type sDesc = types.findDescriptorType(s);
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1204
                final List<Type> tTypeParams = tDesc.getTypeArguments();
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1205
                final List<Type> tTypeParamsNoCapture = tDescNoCapture.getTypeArguments();
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1206
                final List<Type> sTypeParams = sDesc.getTypeArguments();
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1207
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1208
                // compare type parameters
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1209
                if (tDesc.hasTag(FORALL) && !types.hasSameBounds((ForAll) tDesc, (ForAll) tDescNoCapture)) {
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1210
                    return false;
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1211
                }
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1212
                // can't use Types.hasSameBounds on sDesc because bounds may have ivars
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1213
                List<Type> tIter = tTypeParams;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1214
                List<Type> sIter = sTypeParams;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1215
                while (tIter.nonEmpty() && sIter.nonEmpty()) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1216
                    Type tBound = tIter.head.getUpperBound();
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1217
                    Type sBound = types.subst(sIter.head.getUpperBound(), sTypeParams, tTypeParams);
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1218
                    if (tBound.containsAny(tTypeParams) && inferenceContext().free(sBound)) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1219
                        return false;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1220
                    }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1221
                    if (!types.isSameType(tBound, inferenceContext().asUndetVar(sBound))) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1222
                        return false;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1223
                    }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1224
                    tIter = tIter.tail;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1225
                    sIter = sIter.tail;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1226
                }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1227
                if (!tIter.isEmpty() || !sIter.isEmpty()) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1228
                    return false;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1229
                }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1230
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1231
                // compare parameters
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1232
                List<Type> tParams = tDesc.getParameterTypes();
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1233
                List<Type> tParamsNoCapture = tDescNoCapture.getParameterTypes();
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1234
                List<Type> sParams = sDesc.getParameterTypes();
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1235
                while (tParams.nonEmpty() && tParamsNoCapture.nonEmpty() && sParams.nonEmpty()) {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1236
                    Type tParam = tParams.head;
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1237
                    Type tParamNoCapture = types.subst(tParamsNoCapture.head, tTypeParamsNoCapture, tTypeParams);
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1238
                    Type sParam = types.subst(sParams.head, sTypeParams, tTypeParams);
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1239
                    if (tParam.containsAny(tTypeParams) && inferenceContext().free(sParam)) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1240
                        return false;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1241
                    }
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1242
                    if (!types.isSubtype(inferenceContext().asUndetVar(sParam), tParam)) {
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1243
                        return false;
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1244
                    }
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1245
                    if (!types.isSameType(tParamNoCapture, inferenceContext().asUndetVar(sParam))) {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1246
                        return false;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1247
                    }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1248
                    tParams = tParams.tail;
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1249
                    tParamsNoCapture = tParamsNoCapture.tail;
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1250
                    sParams = sParams.tail;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1251
                }
38913
5b15a5ed3b0d 8144767: Fix handling of capture variables in most-specific test
dlsmith
parents: 36996
diff changeset
  1252
                if (!tParams.isEmpty() || !tParamsNoCapture.isEmpty() || !sParams.isEmpty()) {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1253
                    return false;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1254
                }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1255
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1256
                // compare returns
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1257
                Type tRet = tDesc.getReturnType();
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1258
                Type sRet = types.subst(sDesc.getReturnType(), sTypeParams, tTypeParams);
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1259
                if (tRet.containsAny(tTypeParams) && inferenceContext().free(sRet)) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1260
                    return false;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1261
                }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1262
                MostSpecificFunctionReturnChecker msc = new MostSpecificFunctionReturnChecker(tRet, sRet);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1263
                msc.scan(tree);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1264
                return msc.result;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1265
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1266
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1267
            /**
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1268
             * 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
  1269
             * 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
  1270
             */
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1271
            class MostSpecificFunctionReturnChecker extends DeferredAttr.PolyScanner {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1272
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1273
                final Type tRet;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1274
                final Type sRet;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1275
                boolean result;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1276
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1277
                /** Parameters {@code t} and {@code s} are unrelated functional interface types. */
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1278
                MostSpecificFunctionReturnChecker(Type tRet, Type sRet) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1279
                    this.tRet = tRet;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1280
                    this.sRet = sRet;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1281
                    result = true;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1282
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1283
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1284
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1285
                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
  1286
                    result &= false;
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1287
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1288
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1289
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1290
                public void visitConditional(JCConditional tree) {
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1291
                    scan(asExpr(tree.truepart));
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1292
                    scan(asExpr(tree.falsepart));
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1293
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1294
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1295
                @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1296
                public void visitReference(JCMemberReference tree) {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1297
                    if (sRet.hasTag(VOID)) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1298
                        result &= true;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1299
                    } else if (tRet.hasTag(VOID)) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1300
                        result &= false;
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1301
                    } else if (tRet.isPrimitive() != sRet.isPrimitive()) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1302
                        boolean retValIsPrimitive =
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1303
                                tree.refPolyKind == PolyKind.STANDALONE &&
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1304
                                tree.sym.type.getReturnType().isPrimitive();
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1305
                        result &= (retValIsPrimitive == tRet.isPrimitive()) &&
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1306
                                  (retValIsPrimitive != sRet.isPrimitive());
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1307
                    } else {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1308
                        result &= compatibleBySubtyping(tRet, sRet);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1309
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1310
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1311
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1312
                @Override
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1313
                public void visitParens(JCParens tree) {
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1314
                    scan(asExpr(tree.expr));
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1315
                }
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1316
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1317
                @Override
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1318
                public void visitLambda(JCLambda tree) {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1319
                    if (sRet.hasTag(VOID)) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1320
                        result &= true;
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1321
                    } else if (tRet.hasTag(VOID)) {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1322
                        result &= false;
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1323
                    } else {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1324
                        List<JCExpression> lambdaResults = lambdaResults(tree);
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1325
                        if (!lambdaResults.isEmpty() && unrelatedFunctionalInterfaces(tRet, sRet)) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1326
                            for (JCExpression expr : lambdaResults) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1327
                                result &= functionalInterfaceMostSpecific(tRet, sRet, expr);
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1328
                            }
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1329
                        } else if (!lambdaResults.isEmpty() && tRet.isPrimitive() != sRet.isPrimitive()) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1330
                            for (JCExpression expr : lambdaResults) {
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1331
                                boolean retValIsPrimitive = expr.isStandalone() && expr.type.isPrimitive();
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1332
                                result &= (retValIsPrimitive == tRet.isPrimitive()) &&
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1333
                                        (retValIsPrimitive != sRet.isPrimitive());
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1334
                            }
34992
eaba62b5d8e2 8037789: Surprising more-specific results for lambda bodies with no return expressions
dlsmith
parents: 34854
diff changeset
  1335
                        } else {
34995
e4e19f521ee7 8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents: 34992
diff changeset
  1336
                            result &= compatibleBySubtyping(tRet, sRet);
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1337
                        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1338
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1339
                }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1340
                //where
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1341
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1342
                private List<JCExpression> lambdaResults(JCLambda lambda) {
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1343
                    if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) {
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1344
                        return List.of(asExpr((JCExpression) lambda.body));
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1345
                    } else {
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1346
                        final ListBuffer<JCExpression> buffer = new ListBuffer<>();
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1347
                        DeferredAttr.LambdaReturnScanner lambdaScanner =
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1348
                                new DeferredAttr.LambdaReturnScanner() {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1349
                                    @Override
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1350
                                    public void visitReturn(JCReturn tree) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1351
                                        if (tree.expr != null) {
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1352
                                            buffer.append(asExpr(tree.expr));
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1353
                                        }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1354
                                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1355
                                };
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1356
                        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
  1357
                        return buffer.toList();
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1358
                    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1359
                }
32709
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1360
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1361
                private JCExpression asExpr(JCExpression expr) {
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1362
                    if (expr.type.hasTag(DEFERRED)) {
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1363
                        JCTree speculativeTree = ((DeferredType)expr.type).speculativeTree(deferredAttrContext);
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1364
                        if (speculativeTree != deferredAttr.stuckTree) {
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1365
                            expr = (JCExpression)speculativeTree;
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1366
                        }
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1367
                    }
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1368
                    return expr;
55d136799f79 8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents: 32545
diff changeset
  1369
                }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1370
            }
24404
cf534ffbc9d8 8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents: 24400
diff changeset
  1371
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1372
        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1373
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1374
        public MethodCheck mostSpecificCheck(List<Type> actuals) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1375
            Assert.error("Cannot get here!");
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1376
            return null;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1377
        }
15374
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1378
    }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1379
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1380
    public static class InapplicableMethodException extends RuntimeException {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1381
        private static final long serialVersionUID = 0;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1382
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1383
        JCDiagnostic diagnostic;
49876
ac916fea6ec7 8202157: remove the use of string keys at InapplicableMethodException
vromero
parents: 49872
diff changeset
  1384
ac916fea6ec7 8202157: remove the use of string keys at InapplicableMethodException
vromero
parents: 49872
diff changeset
  1385
        InapplicableMethodException(JCDiagnostic diag) {
12334
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1386
            this.diagnostic = diag;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1387
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1388
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1389
        public JCDiagnostic getDiagnostic() {
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1390
            return diagnostic;
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1391
        }
29e1bfdcba4e 7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents: 12082
diff changeset
  1392
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1393
06bc494ca11e Initial load
duke
parents:
diff changeset
  1394
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1395
 *  Symbol lookup
06bc494ca11e Initial load
duke
parents:
diff changeset
  1396
 *  the following naming conventions for arguments are used
06bc494ca11e Initial load
duke
parents:
diff changeset
  1397
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1398
 *       env      is the environment where the symbol was mentioned
06bc494ca11e Initial load
duke
parents:
diff changeset
  1399
 *       site     is the type of which the symbol is a member
06bc494ca11e Initial load
duke
parents:
diff changeset
  1400
 *       name     is the symbol's name
06bc494ca11e Initial load
duke
parents:
diff changeset
  1401
 *                if no arguments are given
06bc494ca11e Initial load
duke
parents:
diff changeset
  1402
 *       argtypes are the value arguments, if we search for a method
06bc494ca11e Initial load
duke
parents:
diff changeset
  1403
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1404
 *  If no symbol was found, a ResolveError detailing the problem is returned.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1405
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1406
06bc494ca11e Initial load
duke
parents:
diff changeset
  1407
    /** Find field. Synthetic fields are always skipped.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1408
     *  @param env     The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1409
     *  @param site    The original type from where the selection takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1410
     *  @param name    The name of the field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1411
     *  @param c       The class to search for the field. This is always
06bc494ca11e Initial load
duke
parents:
diff changeset
  1412
     *                 a superclass or implemented interface of site's class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1413
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1414
    Symbol findField(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1415
                     Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1416
                     Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1417
                     TypeSymbol c) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  1418
        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
  1419
            c = c.type.getUpperBound().tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1420
        Symbol bestSoFar = varNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1421
        Symbol sym;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1422
        for (Symbol s : c.members().getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1423
            if (s.kind == VAR && (s.flags_field & SYNTHETIC) == 0) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1424
                return isAccessible(env, site, s)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1425
                    ? s : new AccessError(env, site, s);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1426
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1427
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1428
        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
  1429
        if (st != null && (st.hasTag(CLASS) || st.hasTag(TYPEVAR))) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1430
            sym = findField(env, site, name, st.tsym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1431
            bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1432
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1433
        for (List<Type> l = types.interfaces(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1434
             bestSoFar.kind != AMBIGUOUS && l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1435
             l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1436
            sym = findField(env, site, name, l.head.tsym);
18378
00267721fe3a 6360970: javac erroneously accept ambiguous field reference
mcimadamore
parents: 17998
diff changeset
  1437
            if (bestSoFar.exists() && sym.exists() &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1438
                sym.owner != bestSoFar.owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1439
                bestSoFar = new AmbiguityError(bestSoFar, sym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1440
            else
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1441
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1442
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1443
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1444
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1445
06bc494ca11e Initial load
duke
parents:
diff changeset
  1446
    /** Resolve a field identifier, throw a fatal error if not found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1447
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1448
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1449
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  1450
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1451
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1452
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1453
    public VarSymbol resolveInternalField(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1454
                                          Type site, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1455
        Symbol sym = findField(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1456
        if (sym.kind == VAR) return (VarSymbol)sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1457
        else throw new FatalError(
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  1458
                 diags.fragment(Fragments.FatalErrCantLocateField(name)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1459
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1460
06bc494ca11e Initial load
duke
parents:
diff changeset
  1461
    /** Find unqualified variable or field with given name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1462
     *  Synthetic fields always skipped.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1463
     *  @param env     The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1464
     *  @param name    The name of the variable or field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1465
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1466
    Symbol findVar(Env<AttrContext> env, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1467
        Symbol bestSoFar = varNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1468
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1469
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1470
        while (env1.outer != null) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1471
            Symbol sym = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1472
            if (isStatic(env1)) staticOnly = true;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1473
            for (Symbol s : env1.info.scope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1474
                if (s.kind == VAR && (s.flags_field & SYNTHETIC) == 0) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1475
                    sym = s;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1476
                    break;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1477
                }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1478
            }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1479
            if (sym == null) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1480
                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
  1481
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1482
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1483
                if (staticOnly &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1484
                    sym.kind == VAR &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1485
                    sym.owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1486
                    (sym.flags() & STATIC) == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1487
                    return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1488
                else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1489
                    return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1490
            } else {
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1491
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1492
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1493
06bc494ca11e Initial load
duke
parents:
diff changeset
  1494
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1495
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1496
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1497
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1498
        Symbol sym = findField(env, syms.predefClass.type, name, syms.predefClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1499
        if (sym.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1500
            return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1501
        if (bestSoFar.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1502
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1503
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
  1504
        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
  1505
        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
  1506
            for (Symbol currentSymbol : sc.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1507
                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
  1508
                    continue;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1509
                // 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
  1510
                if (!bestSoFar.kind.isResolutionError() &&
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1511
                    currentSymbol.owner != bestSoFar.owner)
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1512
                    return new AmbiguityError(bestSoFar, currentSymbol);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1513
                else if (!bestSoFar.kind.betterThan(VAR)) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1514
                    origin = sc.getOrigin(currentSymbol).owner;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1515
                    bestSoFar = isAccessible(env, origin.type, currentSymbol)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1516
                        ? 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
  1517
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1518
            }
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
  1519
            if (bestSoFar.exists()) break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1520
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1521
        if (bestSoFar.kind == VAR && bestSoFar.owner.type != origin.type)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1522
            return bestSoFar.clone(origin);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1523
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1524
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1525
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1526
06bc494ca11e Initial load
duke
parents:
diff changeset
  1527
    Warner noteWarner = new Warner();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1528
06bc494ca11e Initial load
duke
parents:
diff changeset
  1529
    /** Select the best method for a call site among two choices.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1530
     *  @param env              The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1531
     *  @param site             The original type from where the
06bc494ca11e Initial load
duke
parents:
diff changeset
  1532
     *                          selection takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1533
     *  @param argtypes         The invocation's value arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1534
     *  @param typeargtypes     The invocation's type arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1535
     *  @param sym              Proposed new best match.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1536
     *  @param bestSoFar        Previously found best match.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1537
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1538
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1539
     */
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1540
    @SuppressWarnings("fallthrough")
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1541
    Symbol selectBest(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1542
                      Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1543
                      List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1544
                      List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1545
                      Symbol sym,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1546
                      Symbol bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1547
                      boolean allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1548
                      boolean useVarargs) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1549
        if (sym.kind == ERR ||
47942
06652ffab955 8185451: Misleading 'cannot be accessed from outside package' diagnostic for inconsistent varargs override
vromero
parents: 47298
diff changeset
  1550
                (site.tsym != sym.owner && !sym.isInheritedIn(site.tsym, types)) ||
06652ffab955 8185451: Misleading 'cannot be accessed from outside package' diagnostic for inconsistent varargs override
vromero
parents: 47298
diff changeset
  1551
                !notOverriddenIn(site, sym)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1552
            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
  1553
        } 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
  1554
            return bestSoFar.kind.isResolutionError() ?
24400
f05df7f58567 8037379: fix for JDK-8029569 doesn't cover all possible cases
vromero
parents: 24396
diff changeset
  1555
                    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
  1556
                    bestSoFar;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1557
        }
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1558
        Assert.check(!sym.kind.isResolutionError());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1559
        try {
32545
9c4c47640408 8073594: javac, before calling rawInstantiate from selectBest the warner should be cleared out
vromero
parents: 32544
diff changeset
  1560
            types.noWarnings.clear();
12915
28cf1e0dafdc 7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents: 12335
diff changeset
  1561
            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
  1562
                               allowBoxing, useVarargs, types.noWarnings);
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1563
            currentResolutionContext.addApplicableCandidate(sym, mt);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  1564
        } catch (InapplicableMethodException ex) {
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1565
            currentResolutionContext.addInapplicableCandidate(sym, ex.getDiagnostic());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1566
            switch (bestSoFar.kind) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1567
                case ABSENT_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1568
                    return new InapplicableSymbolError(currentResolutionContext);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1569
                case WRONG_MTH:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1570
                    bestSoFar = new InapplicableSymbolsError(currentResolutionContext);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1571
                default:
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1572
                    return bestSoFar;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1573
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1574
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1575
        if (!isAccessible(env, site, sym)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1576
            return (bestSoFar.kind == ABSENT_MTH)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1577
                ? new AccessError(env, site, sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1578
                : bestSoFar;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  1579
        }
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  1580
        return (bestSoFar.kind.isResolutionError() && bestSoFar.kind != AMBIGUOUS)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1581
            ? sym
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1582
            : mostSpecific(argtypes, sym, bestSoFar, env, site, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1583
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1584
06bc494ca11e Initial load
duke
parents:
diff changeset
  1585
    /* Return the most specific of the two methods for a call,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1586
     *  given that both are accessible and applicable.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1587
     *  @param m1               A new candidate for most specific.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1588
     *  @param m2               The previous most specific candidate.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1589
     *  @param env              The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1590
     *  @param site             The original type from where the selection
06bc494ca11e Initial load
duke
parents:
diff changeset
  1591
     *                          takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1592
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1593
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1594
     */
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1595
    Symbol mostSpecific(List<Type> argtypes, Symbol m1,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1596
                        Symbol m2,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1597
                        Env<AttrContext> env,
2511
1ccb94d04005 6400189: raw types and inference
mcimadamore
parents: 1649
diff changeset
  1598
                        final Type site,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1599
                        boolean useVarargs) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1600
        switch (m2.kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1601
        case MTH:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1602
            if (m1 == m2) return m1;
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1603
            boolean m1SignatureMoreSpecific =
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1604
                    signatureMoreSpecific(argtypes, env, site, m1, m2, useVarargs);
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1605
            boolean m2SignatureMoreSpecific =
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1606
                    signatureMoreSpecific(argtypes, env, site, m2, m1, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1607
            if (m1SignatureMoreSpecific && m2SignatureMoreSpecific) {
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1608
                Type mt1 = types.memberType(site, m1);
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1609
                Type mt2 = types.memberType(site, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1610
                if (!types.overrideEquivalent(mt1, mt2))
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1611
                    return ambiguityError(m1, m2);
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1612
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1613
                // same signature; select (a) the non-bridge method, or
06bc494ca11e Initial load
duke
parents:
diff changeset
  1614
                // (b) the one that overrides the other, or (c) the concrete
06bc494ca11e Initial load
duke
parents:
diff changeset
  1615
                // 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
  1616
                if ((m1.flags() & BRIDGE) != (m2.flags() & BRIDGE))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1617
                    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
  1618
48459
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1619
                if (m1.baseSymbol() == m2.baseSymbol()) {
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1620
                    // this is the same imported symbol which has been cloned twice.
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1621
                    // Return the first one (either will do).
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1622
                    return m1;
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1623
                }
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1624
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1625
                // if one overrides or hides the other, use it
06bc494ca11e Initial load
duke
parents:
diff changeset
  1626
                TypeSymbol m1Owner = (TypeSymbol)m1.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1627
                TypeSymbol m2Owner = (TypeSymbol)m2.owner;
48459
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1628
                // the two owners can never be the same if the target methods are compiled from source,
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1629
                // but we need to protect against cases where the methods are defined in some classfile
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1630
                // and make sure we issue an ambiguity error accordingly (by skipping the logic below).
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1631
                if (m1Owner != m2Owner) {
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1632
                    if (types.asSuper(m1Owner.type, m2Owner) != null &&
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1633
                        ((m1.owner.flags_field & INTERFACE) == 0 ||
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1634
                         (m2.owner.flags_field & INTERFACE) != 0) &&
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1635
                        m1.overrides(m2, m1Owner, types, false))
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1636
                        return m1;
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1637
                    if (types.asSuper(m2Owner.type, m1Owner) != null &&
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1638
                        ((m2.owner.flags_field & INTERFACE) == 0 ||
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1639
                         (m1.owner.flags_field & INTERFACE) != 0) &&
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1640
                        m2.overrides(m1, m2Owner, types, false))
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1641
                        return m2;
a5f815d1060b 8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents: 48054
diff changeset
  1642
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1643
                boolean m1Abstract = (m1.flags() & ABSTRACT) != 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1644
                boolean m2Abstract = (m2.flags() & ABSTRACT) != 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1645
                if (m1Abstract && !m2Abstract) return m2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1646
                if (m2Abstract && !m1Abstract) return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1647
                // both abstract or both concrete
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1648
                return ambiguityError(m1, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1649
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1650
            if (m1SignatureMoreSpecific) return m1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1651
            if (m2SignatureMoreSpecific) return m2;
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1652
            return ambiguityError(m1, m2);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1653
        case AMBIGUOUS:
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1654
            //compare m1 to ambiguous methods in m2
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  1655
            AmbiguityError e = (AmbiguityError)m2.baseSymbol();
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1656
            boolean m1MoreSpecificThanAnyAmbiguous = true;
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1657
            boolean allAmbiguousMoreSpecificThanM1 = true;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1658
            for (Symbol s : e.ambiguousSyms) {
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1659
                Symbol moreSpecific = mostSpecific(argtypes, m1, s, env, site, useVarargs);
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1660
                m1MoreSpecificThanAnyAmbiguous &= moreSpecific == m1;
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1661
                allAmbiguousMoreSpecificThanM1 &= moreSpecific == s;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  1662
            }
24393
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1663
            if (m1MoreSpecificThanAnyAmbiguous)
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1664
                return m1;
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1665
            //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
  1666
            //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
  1667
            if (!allAmbiguousMoreSpecificThanM1)
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1668
                e.addAmbiguousSymbol(m1);
381ade32a034 8041663: Sensitive dependence on location of nested interface
jlahoda
parents: 24293
diff changeset
  1669
            return e;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1670
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1671
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1672
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1673
    }
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1674
    //where
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1675
    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
  1676
        noteWarner.clear();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1677
        int maxLength = Math.max(
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1678
                            Math.max(m1.type.getParameterTypes().length(), actuals.length()),
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1679
                            m2.type.getParameterTypes().length());
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1680
        MethodResolutionContext prevResolutionContext = currentResolutionContext;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1681
        try {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1682
            currentResolutionContext = new MethodResolutionContext();
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1683
            currentResolutionContext.step = prevResolutionContext.step;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1684
            currentResolutionContext.methodCheck =
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1685
                    prevResolutionContext.methodCheck.mostSpecificCheck(actuals);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1686
            Type mst = instantiate(env, site, m2, null,
24293
0d889f759fac 8033718: Inference ignores capture variable as upper bound
dlsmith
parents: 24226
diff changeset
  1687
                    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
  1688
                    false, useVarargs, noteWarner);
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1689
            return mst != null &&
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1690
                    !noteWarner.hasLint(Lint.LintCategory.UNCHECKED);
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1691
        } finally {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1692
            currentResolutionContext = prevResolutionContext;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  1693
        }
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  1694
    }
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  1695
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  1696
    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
  1697
        if ((msym.flags() & VARARGS) != 0 && allowVarargs) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1698
            Type varargsElem = types.elemtype(args.last());
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1699
            if (varargsElem == null) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1700
                Assert.error("Bad varargs = " + args.last() + " " + msym);
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1701
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1702
            List<Type> newArgs = args.reverse().tail.prepend(varargsElem).reverse();
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1703
            while (newArgs.length() < length) {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1704
                newArgs = newArgs.append(newArgs.last());
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1705
            }
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1706
            return newArgs;
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1707
        } else {
fb8f6acf09cc 8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents: 15362
diff changeset
  1708
            return args;
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  1709
        }
7623
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1710
    }
66d98f7ba8c7 5088429: varargs overloading problem
mcimadamore
parents: 7209
diff changeset
  1711
    //where
8228
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1712
    Symbol ambiguityError(Symbol m1, Symbol m2) {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1713
        if (((m1.flags() | m2.flags()) & CLASH) != 0) {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1714
            return (m1.flags() & CLASH) == 0 ? m1 : m2;
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1715
        } else {
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1716
            return new AmbiguityError(m1, m2);
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1717
        }
4e6ee38974b2 6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents: 8045
diff changeset
  1718
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1719
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1720
    Symbol findMethodInScope(Env<AttrContext> env,
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1721
            Type site,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1722
            Name name,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1723
            List<Type> argtypes,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1724
            List<Type> typeargtypes,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1725
            Scope sc,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1726
            Symbol bestSoFar,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1727
            boolean allowBoxing,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1728
            boolean useVarargs,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1729
            boolean abstractok) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1730
        for (Symbol s : sc.getSymbolsByName(name, new LookupFilter(abstractok))) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1731
            bestSoFar = selectBest(env, site, argtypes, typeargtypes, s,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1732
                    bestSoFar, allowBoxing, useVarargs);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1733
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1734
        return bestSoFar;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1735
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1736
    //where
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1737
        class LookupFilter implements Filter<Symbol> {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1738
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1739
            boolean abstractOk;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1740
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1741
            LookupFilter(boolean abstractOk) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1742
                this.abstractOk = abstractOk;
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
            public boolean accepts(Symbol s) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1746
                long flags = s.flags();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1747
                return s.kind == MTH &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1748
                        (flags & SYNTHETIC) == 0 &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1749
                        (abstractOk ||
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1750
                        (flags & DEFAULT) != 0 ||
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1751
                        (flags & ABSTRACT) == 0);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1752
            }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  1753
        }
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1754
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1755
    /** Find best qualified method matching given name, type and value
06bc494ca11e Initial load
duke
parents:
diff changeset
  1756
     *  arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1757
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1758
     *  @param site      The original type from where the selection
06bc494ca11e Initial load
duke
parents:
diff changeset
  1759
     *                   takes place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1760
     *  @param name      The method's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1761
     *  @param argtypes  The method's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1762
     *  @param typeargtypes The method's type arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
  1763
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1764
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1765
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1766
    Symbol findMethod(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1767
                      Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1768
                      Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1769
                      List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1770
                      List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1771
                      boolean allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1772
                      boolean useVarargs) {
5736
ee0850472ca1 6939134: JSR 292 adjustments to method handle invocation
jrose
parents: 5321
diff changeset
  1773
        Symbol bestSoFar = methodNotFound;
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  1774
        bestSoFar = findMethod(env,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1775
                          site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1776
                          name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1777
                          argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1778
                          typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1779
                          site.tsym.type,
5736
ee0850472ca1 6939134: JSR 292 adjustments to method handle invocation
jrose
parents: 5321
diff changeset
  1780
                          bestSoFar,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1781
                          allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1782
                          useVarargs);
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  1783
        return bestSoFar;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1784
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1785
    // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  1786
    private Symbol findMethod(Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1787
                              Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1788
                              Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1789
                              List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1790
                              List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1791
                              Type intype,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1792
                              Symbol bestSoFar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1793
                              boolean allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1794
                              boolean useVarargs) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1795
        @SuppressWarnings({"unchecked","rawtypes"})
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1796
        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
  1797
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1798
        InterfaceLookupPhase iphase = InterfaceLookupPhase.ABSTRACT_OK;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1799
        for (TypeSymbol s : superclasses(intype)) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1800
            bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1801
                    s.members(), bestSoFar, allowBoxing, useVarargs, true);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1802
            if (name == names.init) return bestSoFar;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1803
            iphase = (iphase == null) ? null : iphase.update(s, this);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1804
            if (iphase != null) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1805
                for (Type itype : types.interfaces(s.type)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1806
                    itypes[iphase.ordinal()] = types.union(types.closure(itype), itypes[iphase.ordinal()]);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1807
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1808
            }
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1809
        }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1810
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1811
        Symbol concrete = bestSoFar.kind.isValid() &&
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1812
                (bestSoFar.flags() & ABSTRACT) == 0 ?
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1813
                bestSoFar : methodNotFound;
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1814
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1815
        for (InterfaceLookupPhase iphase2 : InterfaceLookupPhase.values()) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1816
            //keep searching for abstract methods
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1817
            for (Type itype : itypes[iphase2.ordinal()]) {
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1818
                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
  1819
                if (iphase2 == InterfaceLookupPhase.DEFAULT_OK &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1820
                        (itype.tsym.flags() & DEFAULT) == 0) continue;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  1821
                bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1822
                        itype.tsym.members(), bestSoFar, allowBoxing, useVarargs, true);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1823
                if (concrete != bestSoFar &&
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1824
                    concrete.kind.isValid() &&
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  1825
                    bestSoFar.kind.isValid() &&
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1826
                        types.isSubSignature(concrete.type, bestSoFar.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1827
                    //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
  1828
                    //most specific ends up comparing abstract methods that might have
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1829
                    //been implemented by some concrete method in a subclass and,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1830
                    //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
  1831
                    //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
  1832
                    //to explicitly call that out (see CR 6178365)
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1833
                    bestSoFar = concrete;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1834
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1835
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1836
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1837
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1838
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1839
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1840
    enum InterfaceLookupPhase {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1841
        ABSTRACT_OK() {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1842
            @Override
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1843
            InterfaceLookupPhase update(Symbol s, Resolve rs) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1844
                //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
  1845
                //(as concrete classes are expected to implement all abstracts coming
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1846
                //from superinterfaces)
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1847
                if ((s.flags() & (ABSTRACT | INTERFACE | ENUM)) != 0) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1848
                    return this;
23105
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  1849
                } else {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1850
                    return DEFAULT_OK;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1851
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1852
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1853
        },
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1854
        DEFAULT_OK() {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1855
            @Override
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1856
            InterfaceLookupPhase update(Symbol s, Resolve rs) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1857
                return this;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1858
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1859
        };
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1860
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1861
        abstract InterfaceLookupPhase update(Symbol s, Resolve rs);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1862
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  1863
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1864
    /**
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1865
     * Return an Iterable object to scan the superclasses of a given type.
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1866
     * 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
  1867
     * access more supertypes than strictly needed (as this could trigger completion
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1868
     * errors if some of the not-needed supertypes are missing/ill-formed).
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1869
     */
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1870
    Iterable<TypeSymbol> superclasses(final Type intype) {
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1871
        return () -> new Iterator<TypeSymbol>() {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1872
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1873
            List<TypeSymbol> seen = List.nil();
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1874
            TypeSymbol currentSym = symbolFor(intype);
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1875
            TypeSymbol prevSym = null;
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1876
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1877
            public boolean hasNext() {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1878
                if (currentSym == syms.noSymbol) {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1879
                    currentSym = symbolFor(types.supertype(prevSym.type));
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1880
                }
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1881
                return currentSym != null;
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1882
            }
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1883
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1884
            public TypeSymbol next() {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1885
                prevSym = currentSym;
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1886
                currentSym = syms.noSymbol;
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1887
                Assert.check(prevSym != null || prevSym != syms.noSymbol);
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1888
                return prevSym;
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1889
            }
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1890
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1891
            public void remove() {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1892
                throw new UnsupportedOperationException();
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1893
            }
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1894
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1895
            TypeSymbol symbolFor(Type t) {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1896
                if (!t.hasTag(CLASS) &&
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1897
                        !t.hasTag(TYPEVAR)) {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1898
                    return null;
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1899
                }
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1900
                t = types.skipTypeVars(t, false);
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1901
                if (seen.contains(t.tsym)) {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1902
                    //degenerate case in which we have a circular
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1903
                    //class hierarchy - because of ill-formed classfiles
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1904
                    return null;
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1905
                }
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1906
                seen = seen.prepend(t.tsym);
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42824
diff changeset
  1907
                return t.tsym;
14045
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1908
            }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1909
        };
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1910
    }
c66c0a81c4ab 7193913: Cleanup Resolve.findMethod
mcimadamore
parents: 13844
diff changeset
  1911
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1912
    /** Find unqualified method matching given name, type and value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1913
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1914
     *  @param name      The method's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1915
     *  @param argtypes  The method's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1916
     *  @param typeargtypes  The method's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1917
     *  @param allowBoxing Allow boxing conversions of arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1918
     *  @param useVarargs Box trailing arguments into an array for varargs.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1919
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1920
    Symbol findFun(Env<AttrContext> env, Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1921
                   List<Type> argtypes, List<Type> typeargtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1922
                   boolean allowBoxing, boolean useVarargs) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1923
        Symbol bestSoFar = methodNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1924
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1925
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1926
        while (env1.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1927
            if (isStatic(env1)) staticOnly = true;
34854
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1928
            Assert.check(env1.info.preferredTreeForDiagnostics == null);
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1929
            env1.info.preferredTreeForDiagnostics = env.tree;
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1930
            try {
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1931
                Symbol sym = findMethod(
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1932
                    env1, env1.enclClass.sym.type, name, argtypes, typeargtypes,
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1933
                    allowBoxing, useVarargs);
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1934
                if (sym.exists()) {
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1935
                    if (staticOnly &&
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1936
                        sym.kind == MTH &&
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1937
                        sym.owner.kind == TYP &&
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1938
                        (sym.flags() & STATIC) == 0) return new StaticError(sym);
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1939
                    else return sym;
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1940
                } else {
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1941
                    bestSoFar = bestOf(bestSoFar, sym);
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1942
                }
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1943
            } finally {
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  1944
                env1.info.preferredTreeForDiagnostics = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1945
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1946
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1947
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1948
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1949
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1950
        Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1951
                                typeargtypes, allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1952
        if (sym.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1953
            return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1954
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1955
        for (Symbol currentSym : env.toplevel.namedImportScope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1956
            Symbol origin = env.toplevel.namedImportScope.getOrigin(currentSym).owner;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1957
            if (currentSym.kind == MTH) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1958
                if (currentSym.owner.type != origin.type)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1959
                    currentSym = currentSym.clone(origin);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1960
                if (!isAccessible(env, origin.type, currentSym))
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1961
                    currentSym = new AccessError(env, origin.type, currentSym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1962
                bestSoFar = selectBest(env, origin.type,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1963
                                       argtypes, typeargtypes,
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1964
                                       currentSym, bestSoFar,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1965
                                       allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1966
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1967
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1968
        if (bestSoFar.exists())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1969
            return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1970
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1971
        for (Symbol currentSym : env.toplevel.starImportScope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1972
            Symbol origin = env.toplevel.starImportScope.getOrigin(currentSym).owner;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1973
            if (currentSym.kind == MTH) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1974
                if (currentSym.owner.type != origin.type)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1975
                    currentSym = currentSym.clone(origin);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1976
                if (!isAccessible(env, origin.type, currentSym))
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1977
                    currentSym = new AccessError(env, origin.type, currentSym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1978
                bestSoFar = selectBest(env, origin.type,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1979
                                       argtypes, typeargtypes,
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  1980
                                       currentSym, bestSoFar,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  1981
                                       allowBoxing, useVarargs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1982
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1983
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1984
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1985
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1986
06bc494ca11e Initial load
duke
parents:
diff changeset
  1987
    /** Load toplevel or member class with given fully qualified name and
06bc494ca11e Initial load
duke
parents:
diff changeset
  1988
     *  verify that it is accessible.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1989
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1990
     *  @param name      The fully qualified name of the class to be loaded.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1991
     */
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  1992
    Symbol loadClass(Env<AttrContext> env, Name name, RecoveryLoadClass recoveryLoadClass) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1993
        try {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  1994
            ClassSymbol c = finder.loadClass(env.toplevel.modle, name);
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  1995
            return isAccessible(env, c) ? c : new AccessError(env, null, c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24404
diff changeset
  1996
        } catch (ClassFinder.BadClassFile err) {
50374
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  1997
            return new BadClassFileError(err);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1998
        } catch (CompletionFailure ex) {
42824
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  1999
            Symbol candidate = recoveryLoadClass.loadClass(env, name);
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2000
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2001
            if (candidate != null) {
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2002
                return candidate;
41931
d7c9720c4223 8166538: Improve error reporting for compiling against unexported package
jlahoda
parents: 41526
diff changeset
  2003
            }
42824
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2004
41931
d7c9720c4223 8166538: Improve error reporting for compiling against unexported package
jlahoda
parents: 41526
diff changeset
  2005
            return typeNotFound;
d7c9720c4223 8166538: Improve error reporting for compiling against unexported package
jlahoda
parents: 41526
diff changeset
  2006
        }
d7c9720c4223 8166538: Improve error reporting for compiling against unexported package
jlahoda
parents: 41526
diff changeset
  2007
    }
d7c9720c4223 8166538: Improve error reporting for compiling against unexported package
jlahoda
parents: 41526
diff changeset
  2008
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2009
    public interface RecoveryLoadClass {
42824
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2010
        Symbol loadClass(Env<AttrContext> env, Name name);
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2011
    }
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2012
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2013
    private final RecoveryLoadClass noRecovery = (env, name) -> null;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2014
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2015
    private final RecoveryLoadClass doRecoveryLoadClass = new RecoveryLoadClass() {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2016
        @Override public Symbol loadClass(Env<AttrContext> env, Name name) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2017
            List<Name> candidates = Convert.classCandidates(name);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2018
            return lookupInvisibleSymbol(env, name,
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2019
                                         n -> () -> createCompoundIterator(candidates,
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2020
                                                                           c -> syms.getClassesForName(c)
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2021
                                                                                    .iterator()),
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2022
                                         (ms, n) -> {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2023
                for (Name candidate : candidates) {
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2024
                    try {
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2025
                        return finder.loadClass(ms, candidate);
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2026
                    } catch (CompletionFailure cf) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2027
                        //ignore
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2028
                    }
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2029
                }
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2030
                return null;
50539
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2031
            }, sym -> sym.kind == Kind.TYP, typeNotFound);
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2032
        }
42824
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2033
    };
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2034
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2035
    private final RecoveryLoadClass namedImportScopeRecovery = (env, name) -> {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2036
        Scope importScope = env.toplevel.namedImportScope;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2037
        Symbol existing = importScope.findFirst(Convert.shortName(name),
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2038
                                                sym -> sym.kind == TYP && sym.flatName() == name);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2039
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2040
        if (existing != null) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2041
            return new InvisibleSymbolError(env, true, existing);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2042
        }
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2043
        return null;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2044
    };
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2045
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2046
    private final RecoveryLoadClass starImportScopeRecovery = (env, name) -> {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2047
        Scope importScope = env.toplevel.starImportScope;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2048
        Symbol existing = importScope.findFirst(Convert.shortName(name),
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2049
                                                sym -> sym.kind == TYP && sym.flatName() == name);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2050
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2051
        if (existing != null) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2052
            try {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2053
                existing = finder.loadClass(existing.packge().modle, name);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2054
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2055
                return new InvisibleSymbolError(env, true, existing);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2056
            } catch (CompletionFailure cf) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2057
                //ignore
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2058
            }
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2059
        }
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2060
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2061
        return null;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2062
    };
42824
89b14017e8d6 8133896: Update javax.lang.model APIs
jlahoda
parents: 41943
diff changeset
  2063
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2064
    Symbol lookupPackage(Env<AttrContext> env, Name name) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2065
        PackageSymbol pack = syms.lookupPackage(env.toplevel.modle, name);
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2066
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2067
        if (allowModules && isImportOnDemand(env, name)) {
50539
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2068
            if (pack.members().isEmpty()) {
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2069
                return lookupInvisibleSymbol(env, name, syms::getPackagesForName, syms::enterPackage, sym -> {
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2070
                    sym.complete();
50539
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2071
                    return !sym.members().isEmpty();
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2072
                }, pack);
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2073
            }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2074
        }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2075
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2076
        return pack;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2077
    }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2078
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2079
    private boolean isImportOnDemand(Env<AttrContext> env, Name name) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2080
        if (!env.tree.hasTag(IMPORT))
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2081
            return false;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2082
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2083
        JCTree qualid = ((JCImport) env.tree).qualid;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2084
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2085
        if (!qualid.hasTag(SELECT))
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2086
            return false;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2087
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2088
        if (TreeInfo.name(qualid) != names.asterisk)
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2089
            return false;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2090
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2091
        return TreeInfo.fullName(((JCFieldAccess) qualid).selected) == name;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2092
    }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2093
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2094
    private <S extends Symbol> Symbol lookupInvisibleSymbol(Env<AttrContext> env,
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2095
                                                            Name name,
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2096
                                                            Function<Name, Iterable<S>> get,
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2097
                                                            BiFunction<ModuleSymbol, Name, S> load,
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2098
                                                            Predicate<S> validate,
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2099
                                                            Symbol defaultResult) {
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2100
        //even if a class/package cannot be found in the current module and among packages in modules
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2101
        //it depends on that are exported for any or this module, the class/package may exist internally
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2102
        //in some of these modules, or may exist in a module on which this module does not depend.
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2103
        //Provide better diagnostic in such cases by looking for the class in any module:
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2104
        Iterable<? extends S> candidates = get.apply(name);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2105
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2106
        for (S sym : candidates) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2107
            if (validate.test(sym))
50539
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2108
                return createInvisibleSymbolError(env, sym);
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2109
        }
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2110
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2111
        Set<ModuleSymbol> recoverableModules = new HashSet<>(syms.getAllModules());
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2112
49579
fce4252d5227 8189765: Improve error reporting for compiling against package not visible due to modules
jlahoda
parents: 49197
diff changeset
  2113
        recoverableModules.add(syms.unnamedModule);
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2114
        recoverableModules.remove(env.toplevel.modle);
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2115
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2116
        for (ModuleSymbol ms : recoverableModules) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2117
            //avoid overly eager completing classes from source-based modules, as those
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2118
            //may not be completable with the current compiler settings:
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2119
            if (ms.sourceLocation == null) {
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2120
                if (ms.classLocation == null) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2121
                    ms = moduleFinder.findModule(ms);
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2122
                }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2123
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2124
                if (ms.kind != ERR) {
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2125
                    S sym = load.apply(ms, name);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2126
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2127
                    if (sym != null && validate.test(sym)) {
50539
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2128
                        return createInvisibleSymbolError(env, sym);
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2129
                    }
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2130
                }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2131
            }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2132
        }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2133
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2134
        return defaultResult;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2135
    }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2136
50539
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2137
    private Symbol createInvisibleSymbolError(Env<AttrContext> env, Symbol sym) {
43866
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2138
        if (symbolPackageVisible(env, sym)) {
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2139
            return new AccessError(env, null, sym);
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2140
        } else {
50539
7bf4f1b5e438 8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents: 50374
diff changeset
  2141
            return new InvisibleSymbolError(env, false, sym);
43866
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2142
        }
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2143
    }
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2144
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2145
    private boolean symbolPackageVisible(Env<AttrContext> env, Symbol sym) {
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2146
        ModuleSymbol envMod = env.toplevel.modle;
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2147
        PackageSymbol symPack = sym.packge();
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2148
        return envMod == symPack.modle ||
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2149
               envMod.visiblePackages.containsKey(symPack.fullname);
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2150
    }
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  2151
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2152
    /**
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2153
     * 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
  2154
     * if none is found.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2155
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2156
     *  @param site      The original type from where the selection takes
06bc494ca11e Initial load
duke
parents:
diff changeset
  2157
     *                   place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2158
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2159
     *  @param c         The class to search for the member type. This is
06bc494ca11e Initial load
duke
parents:
diff changeset
  2160
     *                   always a superclass or implemented interface of
06bc494ca11e Initial load
duke
parents:
diff changeset
  2161
     *                   site's class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2162
     */
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2163
    Symbol findImmediateMemberType(Env<AttrContext> env,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2164
                                   Type site,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2165
                                   Name name,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2166
                                   TypeSymbol c) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2167
        for (Symbol sym : c.members().getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2168
            if (sym.kind == TYP) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2169
                return isAccessible(env, site, sym)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2170
                    ? sym
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2171
                    : new AccessError(env, site, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2172
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2173
        }
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2174
        return typeNotFound;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2175
    }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2176
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2177
    /** Find a member type inherited from a superclass or interface.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2178
     *  @param env       The current environment.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2179
     *  @param site      The original type from where the selection takes
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2180
     *                   place.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2181
     *  @param name      The type's name.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2182
     *  @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
  2183
     *                   always a superclass or implemented interface of
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2184
     *                   site's class.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2185
     */
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2186
    Symbol findInheritedMemberType(Env<AttrContext> env,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2187
                                   Type site,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2188
                                   Name name,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2189
                                   TypeSymbol c) {
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2190
        Symbol bestSoFar = typeNotFound;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2191
        Symbol sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2192
        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
  2193
        if (st != null && st.hasTag(CLASS)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2194
            sym = findMemberType(env, site, name, st.tsym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2195
            bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2196
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2197
        for (List<Type> l = types.interfaces(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2198
             bestSoFar.kind != AMBIGUOUS && l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2199
             l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2200
            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
  2201
            if (!bestSoFar.kind.isResolutionError() &&
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  2202
                !sym.kind.isResolutionError() &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2203
                sym.owner != bestSoFar.owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2204
                bestSoFar = new AmbiguityError(bestSoFar, sym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2205
            else
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2206
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2207
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2208
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2209
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2210
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2211
    /** Find qualified member type.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2212
     *  @param env       The current environment.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2213
     *  @param site      The original type from where the selection takes
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2214
     *                   place.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2215
     *  @param name      The type's name.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2216
     *  @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
  2217
     *                   always a superclass or implemented interface of
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2218
     *                   site's class.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2219
     */
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2220
    Symbol findMemberType(Env<AttrContext> env,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2221
                          Type site,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2222
                          Name name,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2223
                          TypeSymbol c) {
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2224
        Symbol sym = findImmediateMemberType(env, site, name, c);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2225
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2226
        if (sym != typeNotFound)
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2227
            return sym;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2228
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2229
        return findInheritedMemberType(env, site, name, c);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2230
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2231
    }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2232
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2233
    /** Find a global type in given scope and load corresponding class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2234
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2235
     *  @param scope     The scope in which to look for the type.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2236
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2237
     */
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2238
    Symbol findGlobalType(Env<AttrContext> env, Scope scope, Name name, RecoveryLoadClass recoveryLoadClass) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2239
        Symbol bestSoFar = typeNotFound;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2240
        for (Symbol s : scope.getSymbolsByName(name)) {
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2241
            Symbol sym = loadClass(env, s.flatName(), recoveryLoadClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2242
            if (bestSoFar.kind == TYP && sym.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2243
                bestSoFar != sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2244
                return new AmbiguityError(bestSoFar, sym);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2245
            else
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2246
                bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2247
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2248
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2249
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2250
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2251
    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
  2252
        for (Symbol sym : env.info.scope.getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2253
            if (sym.kind == TYP) {
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2254
                if (staticOnly &&
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2255
                    sym.type.hasTag(TYPEVAR) &&
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2256
                    sym.owner.kind == TYP)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2257
                    return new StaticError(sym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2258
                return sym;
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2259
            }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2260
        }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2261
        return typeNotFound;
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2262
    }
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2263
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2264
    /** Find an unqualified type symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2265
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2266
     *  @param name      The type's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2267
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2268
    Symbol findType(Env<AttrContext> env, Name name) {
30404
952a476681b2 8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents: 29958
diff changeset
  2269
        if (name == names.empty)
952a476681b2 8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents: 29958
diff changeset
  2270
            return typeNotFound; // do not allow inadvertent "lookup" of anonymous types
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2271
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2272
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2273
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2274
        for (Env<AttrContext> env1 = env; env1.outer != null; env1 = env1.outer) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2275
            if (isStatic(env1)) staticOnly = true;
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2276
            // 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
  2277
            final Symbol tyvar = findTypeVar(env1, name, staticOnly);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2278
            sym = findImmediateMemberType(env1, env1.enclClass.sym.type,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2279
                                          name, env1.enclClass.sym);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2280
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2281
            // 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
  2282
            // immediate member, OR the type variable is for a method.
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2283
            if (tyvar != typeNotFound) {
27386
784414cffd9a 8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents: 27224
diff changeset
  2284
                if (env.baseClause || sym == typeNotFound ||
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2285
                    (tyvar.kind == TYP && tyvar.exists() &&
27386
784414cffd9a 8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents: 27224
diff changeset
  2286
                     tyvar.owner.kind == MTH)) {
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2287
                    return tyvar;
27386
784414cffd9a 8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents: 27224
diff changeset
  2288
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2289
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2290
19652
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2291
            // If the environment is a class def, finish up,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2292
            // otherwise, do the entire findMemberType
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2293
            if (sym == typeNotFound)
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2294
                sym = findInheritedMemberType(env1, env1.enclClass.sym.type,
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2295
                                              name, env1.enclClass.sym);
1186c404a994 7118412: Shadowing of type-variables vs. member types
emc
parents: 19492
diff changeset
  2296
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2297
            if (staticOnly && sym.kind == TYP &&
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  2298
                sym.type.hasTag(CLASS) &&
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  2299
                sym.type.getEnclosingType().hasTag(CLASS) &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2300
                env1.enclClass.sym.type.isParameterized() &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2301
                sym.type.getEnclosingType().isParameterized())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2302
                return new StaticError(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2303
            else if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2304
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2305
06bc494ca11e Initial load
duke
parents:
diff changeset
  2306
            JCClassDecl encl = env1.baseClause ? (JCClassDecl)env1.tree : env1.enclClass;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2307
            if ((encl.sym.flags() & STATIC) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2308
                staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2309
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2310
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10816
diff changeset
  2311
        if (!env.tree.hasTag(IMPORT)) {
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2312
            sym = findGlobalType(env, env.toplevel.namedImportScope, name, namedImportScopeRecovery);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2313
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2314
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2315
50287
64c880300d9b 8193717: Import resolution performance regression in JDK 9
jlahoda
parents: 50250
diff changeset
  2316
            sym = findGlobalType(env, env.toplevel.toplevelScope, name, noRecovery);
64c880300d9b 8193717: Import resolution performance regression in JDK 9
jlahoda
parents: 50250
diff changeset
  2317
            if (sym.exists()) return sym;
64c880300d9b 8193717: Import resolution performance regression in JDK 9
jlahoda
parents: 50250
diff changeset
  2318
            else bestSoFar = bestOf(bestSoFar, sym);
64c880300d9b 8193717: Import resolution performance regression in JDK 9
jlahoda
parents: 50250
diff changeset
  2319
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2320
            sym = findGlobalType(env, env.toplevel.packge.members(), name, noRecovery);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2321
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2322
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2323
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2324
            sym = findGlobalType(env, env.toplevel.starImportScope, name, starImportScopeRecovery);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2325
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2326
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2327
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2328
06bc494ca11e Initial load
duke
parents:
diff changeset
  2329
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2330
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2331
06bc494ca11e Initial load
duke
parents:
diff changeset
  2332
    /** Find an unqualified identifier which matches a specified kind set.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2333
     *  @param env       The current environment.
14541
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14446
diff changeset
  2334
     *  @param name      The identifier's name.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2335
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2336
     *                   (a subset of VAL, TYP, PCK).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2337
     */
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2338
    Symbol findIdent(Env<AttrContext> env, Name name, KindSelector kind) {
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2339
        return checkVarType(findIdentInternal(env, name, kind), name);
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2340
    }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2341
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2342
    Symbol findIdentInternal(Env<AttrContext> env, Name name, KindSelector kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2343
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2344
        Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2345
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2346
        if (kind.contains(KindSelector.VAL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2347
            sym = findVar(env, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2348
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2349
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2350
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2351
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2352
        if (kind.contains(KindSelector.TYP)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2353
            sym = findType(env, name);
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2354
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2355
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2356
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2357
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2358
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2359
        if (kind.contains(KindSelector.PCK))
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2360
            return lookupPackage(env, name);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2361
        else return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2362
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2363
06bc494ca11e Initial load
duke
parents:
diff changeset
  2364
    /** Find an identifier in a package which matches a specified kind set.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2365
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2366
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2367
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2368
     *                   (a nonempty subset of TYP, PCK).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2369
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2370
    Symbol findIdentInPackage(Env<AttrContext> env, TypeSymbol pck,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2371
                              Name name, KindSelector kind) {
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2372
        return checkVarType(findIdentInPackageInternal(env, pck, name, kind), name);
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2373
    }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2374
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2375
    Symbol findIdentInPackageInternal(Env<AttrContext> env, TypeSymbol pck,
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2376
                              Name name, KindSelector kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2377
        Name fullname = TypeSymbol.formFullName(name, pck);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2378
        Symbol bestSoFar = typeNotFound;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2379
        if (kind.contains(KindSelector.TYP)) {
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2380
            RecoveryLoadClass recoveryLoadClass =
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2381
                    allowModules && !kind.contains(KindSelector.PCK) &&
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2382
                    !pck.exists() && !env.info.isSpeculative ?
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2383
                        doRecoveryLoadClass : noRecovery;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  2384
            Symbol sym = loadClass(env, fullname, recoveryLoadClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2385
            if (sym.exists()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2386
                // don't allow programs to use flatnames
06bc494ca11e Initial load
duke
parents:
diff changeset
  2387
                if (name == sym.name) return sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2388
            }
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2389
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2390
        }
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2391
        if (kind.contains(KindSelector.PCK)) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2392
            return lookupPackage(env, fullname);
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2393
        }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  2394
        return bestSoFar;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2395
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2396
06bc494ca11e Initial load
duke
parents:
diff changeset
  2397
    /** Find an identifier among the members of a given type `site'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2398
     *  @param env       The current environment.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2399
     *  @param site      The type containing the symbol to be found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2400
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2401
     *  @param kind      Indicates the possible symbol kinds
06bc494ca11e Initial load
duke
parents:
diff changeset
  2402
     *                   (a subset of VAL, TYP).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2403
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2404
    Symbol findIdentInType(Env<AttrContext> env, Type site,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2405
                           Name name, KindSelector kind) {
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2406
        return checkVarType(findIdentInTypeInternal(env, site, name, kind), name);
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2407
    }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2408
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2409
    Symbol findIdentInTypeInternal(Env<AttrContext> env, Type site,
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2410
                           Name name, KindSelector kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2411
        Symbol bestSoFar = typeNotFound;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2412
        Symbol sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2413
        if (kind.contains(KindSelector.VAL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2414
            sym = findField(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2415
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2416
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2417
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2418
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2419
        if (kind.contains(KindSelector.TYP)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2420
            sym = findMemberType(env, site, name, site.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2421
            if (sym.exists()) return sym;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2422
            else bestSoFar = bestOf(bestSoFar, sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2423
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2424
        return bestSoFar;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2425
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2426
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2427
    private Symbol checkVarType(Symbol bestSoFar, Name name) {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2428
        if (allowLocalVariableTypeInference && name.equals(names.var) &&
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2429
                (bestSoFar.kind == TYP || bestSoFar.kind == ABSENT_TYP)) {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2430
            bestSoFar = new BadVarTypeError();
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2431
        }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2432
        return bestSoFar;
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2433
    }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  2434
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2435
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2436
 *  Access checking
06bc494ca11e Initial load
duke
parents:
diff changeset
  2437
 *  The following methods convert ResolveErrors to ErrorSymbols, issuing
06bc494ca11e Initial load
duke
parents:
diff changeset
  2438
 *  an error message in the process
06bc494ca11e Initial load
duke
parents:
diff changeset
  2439
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2440
06bc494ca11e Initial load
duke
parents:
diff changeset
  2441
    /** If `sym' is a bad symbol: report error and return errSymbol
06bc494ca11e Initial load
duke
parents:
diff changeset
  2442
     *  else pass through unchanged,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2443
     *  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
  2444
     *  symbol {@literal (--> flyweight pattern)}. This improves performance since we
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2445
     *  expect misses to happen frequently.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2446
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  2447
     *  @param sym       The symbol that was found, or a ResolveError.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2448
     *  @param pos       The position to use for error reporting.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2449
     *  @param location  The symbol the served as a context for this lookup
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2450
     *  @param site      The original type from where the selection took place.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2451
     *  @param name      The symbol's name.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2452
     *  @param qualified Did we get here through a qualified expression resolution?
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2453
     *  @param argtypes  The invocation's value arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2454
     *                   if we looked for a method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2455
     *  @param typeargtypes  The invocation's type arguments,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2456
     *                   if we looked for a method.
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2457
     *  @param logResolveHelper helper class used to log resolve errors
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2458
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2459
    Symbol accessInternal(Symbol sym,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2460
                  DiagnosticPosition pos,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2461
                  Symbol location,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2462
                  Type site,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2463
                  Name name,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2464
                  boolean qualified,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2465
                  List<Type> argtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2466
                  List<Type> typeargtypes,
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2467
                  LogResolveHelper logResolveHelper) {
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  2468
        if (sym.kind.isResolutionError()) {
24400
f05df7f58567 8037379: fix for JDK-8029569 doesn't cover all possible cases
vromero
parents: 24396
diff changeset
  2469
            ResolveError errSym = (ResolveError)sym.baseSymbol();
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2470
            sym = errSym.access(name, qualified ? site.tsym : syms.noSymbol);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2471
            argtypes = logResolveHelper.getArgumentTypes(errSym, sym, name, argtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2472
            if (logResolveHelper.resolveDiagnosticNeeded(site, argtypes, typeargtypes)) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2473
                logResolveError(errSym, pos, location, site, name, argtypes, typeargtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2474
            }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2475
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2476
        return sym;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2477
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2478
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2479
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2480
     * 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
  2481
     * resolution diagnostics
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2482
     */
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2483
    Symbol accessMethod(Symbol sym,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2484
                  DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2485
                  Symbol location,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2486
                  Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2487
                  Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2488
                  boolean qualified,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2489
                  List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2490
                  List<Type> typeargtypes) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2491
        return accessInternal(sym, pos, location, site, name, qualified, argtypes, typeargtypes, methodLogResolveHelper);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2492
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2493
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2494
    /** Same as original accessMethod(), but without location.
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2495
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2496
    Symbol accessMethod(Symbol sym,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2497
                  DiagnosticPosition pos,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2498
                  Type site,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2499
                  Name name,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2500
                  boolean qualified,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2501
                  List<Type> argtypes,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2502
                  List<Type> typeargtypes) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2503
        return accessMethod(sym, pos, site.tsym, site, name, qualified, argtypes, typeargtypes);
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2504
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2505
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2506
    /**
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2507
     * 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
  2508
     * type resolution diagnostics
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2509
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2510
    Symbol accessBase(Symbol sym,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2511
                  DiagnosticPosition pos,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2512
                  Symbol location,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2513
                  Type site,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2514
                  Name name,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2515
                  boolean qualified) {
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42827
diff changeset
  2516
        return accessInternal(sym, pos, location, site, name, qualified, List.nil(), null, basicLogResolveHelper);
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2517
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2518
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2519
    /** Same as original accessBase(), but without location.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2520
     */
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2521
    Symbol accessBase(Symbol sym,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2522
                  DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2523
                  Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2524
                  Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2525
                  boolean qualified) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2526
        return accessBase(sym, pos, site.tsym, site, name, qualified);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2527
    }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2528
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2529
    interface LogResolveHelper {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2530
        boolean resolveDiagnosticNeeded(Type site, List<Type> argtypes, List<Type> typeargtypes);
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2531
        List<Type> getArgumentTypes(ResolveError errSym, Symbol accessedSym, Name name, List<Type> argtypes);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2532
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2533
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2534
    LogResolveHelper basicLogResolveHelper = new LogResolveHelper() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2535
        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
  2536
            return !site.isErroneous();
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2537
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2538
        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
  2539
            return argtypes;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2540
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2541
    };
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2542
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2543
    LogResolveHelper methodLogResolveHelper = new LogResolveHelper() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2544
        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
  2545
            return !site.isErroneous() &&
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2546
                        !Type.isErroneous(argtypes) &&
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2547
                        (typeargtypes == null || !Type.isErroneous(typeargtypes));
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2548
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2549
        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
  2550
            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
  2551
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2552
    };
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2553
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2554
    class ResolveDeferredRecoveryMap extends DeferredAttr.RecoveryDeferredTypeMap {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2555
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2556
        public ResolveDeferredRecoveryMap(AttrMode mode, Symbol msym, MethodResolutionPhase step) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2557
            deferredAttr.super(mode, msym, step);
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2558
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2559
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2560
        @Override
50898
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  2561
        protected Type typeOf(DeferredType dt, Type pt) {
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  2562
            Type res = super.typeOf(dt, pt);
19914
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2563
            if (!res.isErroneous()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2564
                switch (TreeInfo.skipParens(dt.tree).getTag()) {
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2565
                    case LAMBDA:
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2566
                    case REFERENCE:
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2567
                        return dt;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2568
                    case CONDEXPR:
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2569
                        return res == Type.recoveryType ?
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2570
                                dt : res;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2571
                }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2572
            }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2573
            return res;
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2574
        }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2575
    }
d86271bd430a 8016177: structural most specific and stuckness
vromero
parents: 19652
diff changeset
  2576
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2577
    /** Check that sym is not an abstract method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2578
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2579
    void checkNonAbstract(DiagnosticPosition pos, Symbol sym) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  2580
        if ((sym.flags() & ABSTRACT) != 0 && (sym.flags() & DEFAULT) == 0)
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  2581
            log.error(pos,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  2582
                      Errors.AbstractCantBeAccessedDirectly(kindName(sym),sym, sym.location()));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2583
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2584
06bc494ca11e Initial load
duke
parents:
diff changeset
  2585
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2586
 *  Name resolution
06bc494ca11e Initial load
duke
parents:
diff changeset
  2587
 *  Naming conventions are as for symbol lookup
06bc494ca11e Initial load
duke
parents:
diff changeset
  2588
 *  Unlike the find... methods these methods will report access errors
06bc494ca11e Initial load
duke
parents:
diff changeset
  2589
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2590
06bc494ca11e Initial load
duke
parents:
diff changeset
  2591
    /** Resolve an unqualified (non-method) identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2592
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2593
     *  @param env       The environment current at the identifier use.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2594
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2595
     *  @param kind      The set of admissible symbol kinds for the identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2596
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2597
    Symbol resolveIdent(DiagnosticPosition pos, Env<AttrContext> env,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2598
                        Name name, KindSelector kind) {
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2599
        return accessBase(
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2600
            findIdent(env, name, kind),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2601
            pos, env.enclClass.sym.type, name, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2602
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2603
06bc494ca11e Initial load
duke
parents:
diff changeset
  2604
    /** Resolve an unqualified method identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2605
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2606
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2607
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2608
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2609
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2610
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2611
    Symbol resolveMethod(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2612
                         Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2613
                         Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2614
                         List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2615
                         List<Type> typeargtypes) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2616
        return lookupMethod(env, pos, env.enclClass.sym, resolveMethodCheck,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2617
                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
  2618
                    @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2619
                    Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2620
                        return findFun(env, name, argtypes, typeargtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2621
                                phase.isBoxingRequired(),
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2622
                                phase.isVarargsRequired());
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2623
                    }});
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  2624
    }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  2625
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2626
    /** Resolve a qualified method identifier
06bc494ca11e Initial load
duke
parents:
diff changeset
  2627
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2628
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2629
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  2630
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2631
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2632
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2633
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2634
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2635
    Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2636
                                  Type site, Name name, List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2637
                                  List<Type> typeargtypes) {
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2638
        return resolveQualifiedMethod(pos, env, site.tsym, site, name, argtypes, typeargtypes);
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2639
    }
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2640
    Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2641
                                  Symbol location, Type site, Name name, List<Type> argtypes,
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  2642
                                  List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2643
        return resolveQualifiedMethod(new MethodResolutionContext(), pos, env, location, site, name, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2644
    }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2645
    private Symbol resolveQualifiedMethod(MethodResolutionContext resolveContext,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2646
                                  DiagnosticPosition pos, Env<AttrContext> env,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2647
                                  Symbol location, Type site, Name name, List<Type> argtypes,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2648
                                  List<Type> typeargtypes) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2649
        return lookupMethod(env, pos, location, resolveContext, new BasicLookupHelper(name, site, argtypes, typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2650
            @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2651
            Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2652
                return findMethod(env, site, name, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2653
                        phase.isBoxingRequired(),
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  2654
                        phase.isVarargsRequired());
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2655
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2656
            @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2657
            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
  2658
                if (sym.kind.isResolutionError()) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2659
                    sym = super.access(env, pos, location, sym);
51047
860a3648c494 8028563: Remove javac support for 6/1.6 source and target values
darcy
parents: 50898
diff changeset
  2660
                } else {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2661
                    MethodSymbol msym = (MethodSymbol)sym;
18389
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18378
diff changeset
  2662
                    if ((msym.flags() & SIGNATURE_POLYMORPHIC) != 0) {
50250
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2663
                        env.info.pendingResolutionPhase = BASIC;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2664
                        return findPolymorphicSignatureInstance(env, sym, argtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2665
                    }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2666
                }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2667
                return sym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2668
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2669
        });
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2670
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2671
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2672
    /** 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
  2673
     *  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
  2674
     *  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
  2675
     *  @param env       Attribution environment
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2676
     *  @param spMethod  signature polymorphic method - i.e. MH.invokeExact
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2677
     *  @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
  2678
     */
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2679
    Symbol findPolymorphicSignatureInstance(Env<AttrContext> env,
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2680
                                            final Symbol spMethod,
8036
17b976649c61 6992698: JSR 292: remove support for transient syntax in polymorphic signature calls
mcimadamore
parents: 8032
diff changeset
  2681
                                            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
  2682
        Type mtype = infer.instantiatePolymorphicSignatureInstance(env,
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  2683
                (MethodSymbol)spMethod, currentResolutionContext, argtypes);
50250
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2684
        return findPolymorphicSignatureInstance(spMethod, mtype);
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2685
    }
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2686
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2687
    Symbol findPolymorphicSignatureInstance(final Symbol spMethod,
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2688
                                            Type mtype) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2689
        for (Symbol sym : polymorphicSignatureScope.getSymbolsByName(spMethod.name)) {
36995
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2690
            // Check that there is already a method symbol for the method
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2691
            // type and owner
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2692
            if (types.isSameType(mtype, sym.type) &&
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2693
                spMethod.owner == sym.owner) {
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2694
                return sym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2695
            }
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2696
        }
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2697
36995
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2698
        // Create the desired method
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2699
        // Retain static modifier is to support invocations to
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2700
        // MethodHandle.linkTo* methods
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2701
        long flags = ABSTRACT | HYPOTHETICAL |
e19153419efd 8149644: Integrate VarHandles
psandoz
parents: 36278
diff changeset
  2702
                     spMethod.flags() & (Flags.AccessFlags | Flags.STATIC);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2703
        Symbol msym = new MethodSymbol(flags, spMethod.name, mtype, spMethod.owner) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2704
            @Override
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2705
            public Symbol baseSymbol() {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2706
                return spMethod;
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2707
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  2708
        };
32949
7e0f345e64a8 8130506: javac AssertionError when invoking MethodHandle.invoke with lambda paramter
sadayapalam
parents: 32709
diff changeset
  2709
        if (!mtype.isErroneous()) { // Cache only if kosher.
7e0f345e64a8 8130506: javac AssertionError when invoking MethodHandle.invoke with lambda paramter
sadayapalam
parents: 32709
diff changeset
  2710
            polymorphicSignatureScope.enter(msym);
7e0f345e64a8 8130506: javac AssertionError when invoking MethodHandle.invoke with lambda paramter
sadayapalam
parents: 32709
diff changeset
  2711
        }
12335
4725d88691dd 7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents: 12334
diff changeset
  2712
        return msym;
6592
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2713
    }
dc56420a69bc 6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents: 6356
diff changeset
  2714
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2715
    /** Resolve a qualified method identifier, throw a fatal error if not
06bc494ca11e Initial load
duke
parents:
diff changeset
  2716
     *  found.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2717
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2718
     *  @param env       The environment current at the method invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2719
     *  @param site      The type of the qualifying expression, in which
06bc494ca11e Initial load
duke
parents:
diff changeset
  2720
     *                   identifier is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2721
     *  @param name      The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2722
     *  @param argtypes  The types of the invocation's value arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2723
     *  @param typeargtypes  The types of the invocation's type arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2724
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2725
    public MethodSymbol resolveInternalMethod(DiagnosticPosition pos, Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2726
                                        Type site, Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2727
                                        List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2728
                                        List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2729
        MethodResolutionContext resolveContext = new MethodResolutionContext();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2730
        resolveContext.internalResolution = true;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2731
        Symbol sym = resolveQualifiedMethod(resolveContext, pos, env, site.tsym,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2732
                site, name, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2733
        if (sym.kind == MTH) return (MethodSymbol)sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2734
        else throw new FatalError(
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  2735
                 diags.fragment(Fragments.FatalErrCantLocateMeth(name)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2736
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2737
06bc494ca11e Initial load
duke
parents:
diff changeset
  2738
    /** Resolve constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2739
     *  @param pos       The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2740
     *  @param env       The environment current at the constructor invocation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2741
     *  @param site      The type of class for which a constructor is searched.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2742
     *  @param argtypes  The types of the constructor invocation's value
06bc494ca11e Initial load
duke
parents:
diff changeset
  2743
     *                   arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2744
     *  @param typeargtypes  The types of the constructor invocation's type
06bc494ca11e Initial load
duke
parents:
diff changeset
  2745
     *                   arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2746
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2747
    Symbol resolveConstructor(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2748
                              Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2749
                              Type site,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2750
                              List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2751
                              List<Type> typeargtypes) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2752
        return resolveConstructor(new MethodResolutionContext(), pos, env, site, argtypes, typeargtypes);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2753
    }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2754
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2755
    private Symbol resolveConstructor(MethodResolutionContext resolveContext,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2756
                              final DiagnosticPosition pos,
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2757
                              Env<AttrContext> env,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2758
                              Type site,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2759
                              List<Type> argtypes,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2760
                              List<Type> typeargtypes) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2761
        return lookupMethod(env, pos, site.tsym, resolveContext, new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2762
            @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2763
            Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2764
                return findConstructor(pos, env, site, argtypes, typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2765
                        phase.isBoxingRequired(),
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2766
                        phase.isVarargsRequired());
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  2767
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2768
        });
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2769
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2770
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2771
    /** Resolve a constructor, throw a fatal error if not found.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2772
     *  @param pos       The position to use for error reporting.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2773
     *  @param env       The environment current at the method invocation.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2774
     *  @param site      The type to be constructed.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2775
     *  @param argtypes  The types of the invocation's value arguments.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2776
     *  @param typeargtypes  The types of the invocation's type arguments.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2777
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2778
    public MethodSymbol resolveInternalConstructor(DiagnosticPosition pos, Env<AttrContext> env,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2779
                                        Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2780
                                        List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2781
                                        List<Type> typeargtypes) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2782
        MethodResolutionContext resolveContext = new MethodResolutionContext();
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2783
        resolveContext.internalResolution = true;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2784
        Symbol sym = resolveConstructor(resolveContext, pos, env, site, argtypes, typeargtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2785
        if (sym.kind == MTH) return (MethodSymbol)sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2786
        else throw new FatalError(
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  2787
                 diags.fragment(Fragments.FatalErrCantLocateCtor(site)));
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2788
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2789
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2790
    Symbol findConstructor(DiagnosticPosition pos, Env<AttrContext> env,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2791
                              Type site, List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2792
                              List<Type> typeargtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2793
                              boolean allowBoxing,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2794
                              boolean useVarargs) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2795
        Symbol sym = findMethod(env, site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2796
                                    names.init, argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2797
                                    typeargtypes, allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  2798
                                    useVarargs);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2799
        chk.checkDeprecated(pos, env.info.scope.owner, sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2800
        return sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2801
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2802
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2803
    /** Resolve constructor using diamond inference.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2804
     *  @param pos       The position to use for error reporting.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2805
     *  @param env       The environment current at the constructor invocation.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2806
     *  @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
  2807
     *                   The scope of this class has been touched in attribution.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2808
     *  @param argtypes  The types of the constructor invocation's value
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2809
     *                   arguments.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2810
     *  @param typeargtypes  The types of the constructor invocation's type
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2811
     *                   arguments.
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2812
     */
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2813
    Symbol resolveDiamond(DiagnosticPosition pos,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2814
                              Env<AttrContext> env,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2815
                              Type site,
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2816
                              List<Type> argtypes,
6344
f190fb7fdd2d 6975275: diamond implementation needs some cleanup
mcimadamore
parents: 6151
diff changeset
  2817
                              List<Type> typeargtypes) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2818
        return lookupMethod(env, pos, site.tsym, resolveMethodCheck,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2819
                new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2820
                    @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  2821
                    Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2822
                        return findDiamond(env, site, argtypes, typeargtypes,
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2823
                                phase.isBoxingRequired(),
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2824
                                phase.isVarargsRequired());
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2825
                    }
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2826
                    @Override
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2827
                    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
  2828
                        if (sym.kind.isResolutionError()) {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2829
                            if (sym.kind != WRONG_MTH &&
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  2830
                                sym.kind != WRONG_MTHS) {
19917
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2831
                                sym = super.access(env, pos, location, sym);
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2832
                            } else {
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2833
                                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
  2834
                                                ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
19917
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2835
                                                null;
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  2836
                                sym = new DiamondError(sym, currentResolutionContext);
19917
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2837
                                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
  2838
                                env.info.pendingResolutionPhase = currentResolutionContext.step;
ebb957ba7b07 8023545: Misleading error message when using diamond operator with private constructor
vromero
parents: 19914
diff changeset
  2839
                            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2840
                        }
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2841
                        return sym;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  2842
                    }});
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2843
    }
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 3372
diff changeset
  2844
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2845
    /** 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
  2846
     *  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
  2847
     *  {@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
  2848
     *  a method check is executed against the modified constructor type:
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13438
diff changeset
  2849
     *  {@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
  2850
     *  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
  2851
     *  the inferred type for the diamond operator.
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2852
     */
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2853
    private Symbol findDiamond(Env<AttrContext> env,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2854
                              Type site,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2855
                              List<Type> argtypes,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2856
                              List<Type> typeargtypes,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2857
                              boolean allowBoxing,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2858
                              boolean useVarargs) {
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2859
        Symbol bestSoFar = methodNotFound;
29776
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
  2860
        TypeSymbol tsym = site.tsym.isInterface() ? syms.objectType.tsym : site.tsym;
984a79b71cfe 8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents: 29774
diff changeset
  2861
        for (final Symbol sym : tsym.members().getSymbolsByName(names.init)) {
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2862
            //- System.out.println(" e " + e.sym);
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2863
            if (sym.kind == MTH &&
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2864
                (sym.flags_field & SYNTHETIC) == 0) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  2865
                    List<Type> oldParams = sym.type.hasTag(FORALL) ?
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2866
                            ((ForAll)sym.type).tvars :
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42827
diff changeset
  2867
                            List.nil();
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2868
                    Type constrType = new ForAll(site.tsym.type.getTypeArguments().appendList(oldParams),
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24393
diff changeset
  2869
                                                 types.createMethodTypeWithReturn(sym.type.asMethodType(), site));
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2870
                    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
  2871
                        @Override
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2872
                        public Symbol baseSymbol() {
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2873
                            return sym;
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2874
                        }
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2875
                    };
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2876
                    bestSoFar = selectBest(env, site, argtypes, typeargtypes,
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 14048
diff changeset
  2877
                            newConstr,
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2878
                            bestSoFar,
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2879
                            allowBoxing,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  2880
                            useVarargs);
12078
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2881
            }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2882
        }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2883
        return bestSoFar;
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2884
    }
7470e05d486b 7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents: 12076
diff changeset
  2885
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2886
    Symbol getMemberReference(DiagnosticPosition pos,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2887
            Env<AttrContext> env,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2888
            JCMemberReference referenceTree,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2889
            Type site,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2890
            Name name) {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2891
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2892
        site = types.capture(site);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2893
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2894
        ReferenceLookupHelper lookupHelper = makeReferenceLookupHelper(
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42827
diff changeset
  2895
                referenceTree, site, name, List.nil(), null, VARARITY);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2896
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2897
        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
  2898
        Symbol sym = lookupMethod(newEnv, env.tree.pos(), site.tsym,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2899
                nilMethodCheck, lookupHelper);
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2900
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2901
        env.info.pendingResolutionPhase = newEnv.info.pendingResolutionPhase;
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2902
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2903
        return sym;
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2904
    }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2905
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2906
    ReferenceLookupHelper makeReferenceLookupHelper(JCMemberReference referenceTree,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2907
                                  Type site,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2908
                                  Name name,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2909
                                  List<Type> argtypes,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2910
                                  List<Type> typeargtypes,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2911
                                  MethodResolutionPhase maxPhase) {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2912
        if (!name.equals(names.init)) {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2913
            //method reference
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2914
            return new MethodReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2915
        } else if (site.hasTag(ARRAY)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2916
            //array constructor reference
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2917
            return new ArrayConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2918
        } else {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2919
            //class constructor reference
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2920
            return new ConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2921
        }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2922
    }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2923
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2924
    /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2925
     * Resolution of member references is typically done as a single
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2926
     * overload resolution step, where the argument types A are inferred from
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2927
     * the target functional descriptor.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2928
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2929
     * If the member reference is a method reference with a type qualifier,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2930
     * a two-step lookup process is performed. The first step uses the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2931
     * expected argument list A, while the second step discards the first
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2932
     * type from A (which is treated as a receiver type).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2933
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2934
     * There are two cases in which inference is performed: (i) if the member
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2935
     * reference is a constructor reference and the qualifier type is raw - in
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2936
     * which case diamond inference is used to infer a parameterization for the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2937
     * type qualifier; (ii) if the member reference is an unbound reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2938
     * where the type qualifier is raw - in that case, during the unbound lookup
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2939
     * the receiver argument type is used to infer an instantiation for the raw
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2940
     * qualifier type.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2941
     *
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2942
     * When a multi-step resolution process is exploited, the process of picking
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2943
     * 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
  2944
     *
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2945
     * This routine returns a pair (T,S), where S is the member reference symbol,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2946
     * 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
  2947
     * the type T might be dynamically inferred (i.e. if constructor reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2948
     * has a raw qualifier).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2949
     */
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2950
    Pair<Symbol, ReferenceLookupHelper> resolveMemberReference(Env<AttrContext> env,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2951
                                  JCMemberReference referenceTree,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2952
                                  Type site,
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2953
                                  Name name,
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2954
                                  List<Type> argtypes,
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2955
                                  List<Type> typeargtypes,
50250
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2956
                                  Type descriptor,
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  2957
                                  MethodCheck methodCheck,
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2958
                                  InferenceContext inferenceContext,
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2959
                                  ReferenceChooser referenceChooser) {
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  2960
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  2961
        //step 1 - bound lookup
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2962
        ReferenceLookupHelper boundLookupHelper = makeReferenceLookupHelper(
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2963
                referenceTree, site, name, argtypes, typeargtypes, VARARITY);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2964
        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
  2965
        MethodResolutionContext boundSearchResolveContext = new MethodResolutionContext();
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2966
        boundSearchResolveContext.methodCheck = methodCheck;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2967
        Symbol boundSym = lookupMethod(boundEnv, env.tree.pos(),
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2968
                site.tsym, boundSearchResolveContext, boundLookupHelper);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2969
        ReferenceLookupResult boundRes = new ReferenceLookupResult(boundSym, boundSearchResolveContext);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2970
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2971
        //step 2 - unbound lookup
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2972
        Symbol unboundSym = methodNotFound;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2973
        Env<AttrContext> unboundEnv = env.dup(env.tree, env.info.dup());
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2974
        ReferenceLookupHelper unboundLookupHelper = boundLookupHelper.unboundLookup(inferenceContext);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2975
        ReferenceLookupResult unboundRes = referenceNotFound;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2976
        if (unboundLookupHelper != null) {
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2977
            MethodResolutionContext unboundSearchResolveContext =
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2978
                    new MethodResolutionContext();
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2979
            unboundSearchResolveContext.methodCheck = methodCheck;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2980
            unboundSym = lookupMethod(unboundEnv, env.tree.pos(),
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2981
                    site.tsym, unboundSearchResolveContext, unboundLookupHelper);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  2982
            unboundRes = new ReferenceLookupResult(unboundSym, unboundSearchResolveContext);
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  2983
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2984
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2985
        //merge results
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2986
        Pair<Symbol, ReferenceLookupHelper> res;
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  2987
        ReferenceLookupResult bestRes = referenceChooser.result(boundRes, unboundRes);
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  2988
        res = new Pair<>(bestRes.sym,
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  2989
                bestRes == unboundRes ? unboundLookupHelper : boundLookupHelper);
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  2990
        env.info.pendingResolutionPhase = bestRes == unboundRes ?
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2991
                unboundEnv.info.pendingResolutionPhase :
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  2992
                boundEnv.info.pendingResolutionPhase;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  2993
50250
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2994
        if (!res.fst.kind.isResolutionError()) {
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2995
            //handle sigpoly method references
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2996
            MethodSymbol msym = (MethodSymbol)res.fst;
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2997
            if ((msym.flags() & SIGNATURE_POLYMORPHIC) != 0) {
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2998
                env.info.pendingResolutionPhase = BASIC;
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  2999
                res = new Pair<>(findPolymorphicSignatureInstance(msym, descriptor), res.snd);
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  3000
            }
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  3001
        }
04f9bb270ab8 8203488: Remove error generation from TransTypes
mcimadamore
parents: 49876
diff changeset
  3002
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3003
        return res;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3004
    }
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3005
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3006
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3007
     * 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
  3008
     * 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
  3009
     * 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
  3010
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3011
    static class ReferenceLookupResult {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3012
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3013
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3014
         * 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
  3015
         * 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
  3016
         * depending on whether all applicable candidates are static or non-static methods,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3017
         * 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
  3018
         * its kind is set to BOTH.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3019
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3020
        enum StaticKind {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3021
            STATIC,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3022
            NON_STATIC,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3023
            BOTH,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3024
            UNDEFINED;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3025
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3026
            /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3027
             * Retrieve the static kind associated with a given (method) symbol.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3028
             */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3029
            static StaticKind from(Symbol s) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3030
                return s.isStatic() ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3031
                        STATIC : NON_STATIC;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3032
            }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3033
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3034
            /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3035
             * Merge two static kinds together.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3036
             */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3037
            static StaticKind reduce(StaticKind sk1, StaticKind sk2) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3038
                if (sk1 == UNDEFINED) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3039
                    return sk2;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3040
                } else if (sk2 == UNDEFINED) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3041
                    return sk1;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3042
                } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3043
                    return sk1 == sk2 ? sk1 : BOTH;
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3044
                }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3045
            }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3046
        }
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3047
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3048
        /** The static kind. */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3049
        StaticKind staticKind;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3050
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3051
        /** The lookup result. */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3052
        Symbol sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3053
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3054
        ReferenceLookupResult(Symbol sym, MethodResolutionContext resolutionContext) {
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3055
            this(sym, staticKind(sym, resolutionContext));
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3056
        }
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3057
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3058
        private ReferenceLookupResult(Symbol sym, StaticKind staticKind) {
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3059
            this.staticKind = staticKind;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3060
            this.sym = sym;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3061
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3062
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3063
        private static StaticKind staticKind(Symbol sym, MethodResolutionContext resolutionContext) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3064
            switch (sym.kind) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3065
                case MTH:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3066
                case AMBIGUOUS:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3067
                    return resolutionContext.candidates.stream()
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3068
                            .filter(c -> c.isApplicable() && c.step == resolutionContext.step)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3069
                            .map(c -> StaticKind.from(c.sym))
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3070
                            .reduce(StaticKind::reduce)
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3071
                            .orElse(StaticKind.UNDEFINED);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3072
                default:
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3073
                    return StaticKind.UNDEFINED;
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3074
            }
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3075
        }
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3076
28456
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
         * 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
  3079
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3080
        boolean isSuccess() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3081
            return staticKind != StaticKind.UNDEFINED;
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  3082
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3083
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3084
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3085
         * Does this result have given static kind?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3086
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3087
        boolean hasKind(StaticKind sk) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3088
            return this.staticKind == sk;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3089
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3090
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3091
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3092
         * 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
  3093
         * some 'better' result) ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3094
         */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3095
        boolean canIgnore() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3096
            switch (sym.kind) {
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3097
                case ABSENT_MTH:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3098
                    return true;
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3099
                case WRONG_MTH:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3100
                    InapplicableSymbolError errSym =
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3101
                            (InapplicableSymbolError)sym.baseSymbol();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3102
                    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
  3103
                            .matches(errSym.errCandidate().snd);
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3104
                case WRONG_MTHS:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3105
                    InapplicableSymbolsError errSyms =
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3106
                            (InapplicableSymbolsError)sym.baseSymbol();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3107
                    return errSyms.filterCandidates(errSyms.mapCandidates()).isEmpty();
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3108
                default:
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3109
                    return false;
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3110
            }
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3111
        }
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3112
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3113
        static ReferenceLookupResult error(Symbol sym) {
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3114
            return new ReferenceLookupResult(sym, StaticKind.UNDEFINED);
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3115
        }
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3116
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3117
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3118
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3119
     * 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
  3120
     * {@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
  3121
     * result of method reference resolution.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3122
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3123
    abstract class ReferenceChooser {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3124
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3125
         * 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
  3126
         * appropriate result generation routine.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3127
         */
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3128
        ReferenceLookupResult result(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3129
            return unboundRes != referenceNotFound ?
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3130
                    unboundResult(boundRes, unboundRes) :
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3131
                    boundResult(boundRes);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3132
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3133
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3134
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3135
         * Generate a symbol from a given bound lookup result.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3136
         */
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3137
        abstract ReferenceLookupResult boundResult(ReferenceLookupResult boundRes);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3138
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3139
        /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3140
         * Generate a symbol from a pair of bound/unbound lookup results.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3141
         */
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3142
        abstract ReferenceLookupResult unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3143
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3144
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3145
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3146
     * 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
  3147
     * is described in JLS SE 8 (15.3.2).
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3148
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3149
    ReferenceChooser basicReferenceChooser = new ReferenceChooser() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3150
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3151
        @Override
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3152
        ReferenceLookupResult boundResult(ReferenceLookupResult boundRes) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3153
            return !boundRes.isSuccess() || boundRes.hasKind(StaticKind.NON_STATIC) ?
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3154
                    boundRes : //the search produces a non-static method
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3155
                    ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.sym, false));
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3156
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3157
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3158
        @Override
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3159
        ReferenceLookupResult unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3160
            if (boundRes.hasKind(StaticKind.STATIC) &&
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3161
                    (!unboundRes.isSuccess() || unboundRes.hasKind(StaticKind.STATIC))) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3162
                //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
  3163
                //during the second search
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3164
                return boundRes;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3165
            } else if (unboundRes.hasKind(StaticKind.NON_STATIC) &&
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3166
                    (!boundRes.isSuccess() || boundRes.hasKind(StaticKind.NON_STATIC))) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3167
                //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
  3168
                //during the first search
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3169
                return unboundRes;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3170
            } else if (boundRes.isSuccess() && unboundRes.isSuccess()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3171
                //both searches produce some result; ambiguity (error recovery)
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3172
                return ReferenceLookupResult.error(ambiguityError(boundRes.sym, unboundRes.sym));
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3173
            } else if (boundRes.isSuccess() || unboundRes.isSuccess()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3174
                //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
  3175
                //produces an non-static method). Alternatively, a given search produced a result
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3176
                //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
  3177
                //staticness (error recovery)
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3178
                return ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.isSuccess() ?
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3179
                        boundRes.sym : unboundRes.sym, true));
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3180
            } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3181
                //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
  3182
                return (boundRes.canIgnore() && !unboundRes.canIgnore()) ?
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3183
                        unboundRes : boundRes;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3184
            }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3185
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3186
    };
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3187
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3188
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3189
     * 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
  3190
     * is described in JLS SE 8 (15.12.2.1).
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3191
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3192
    ReferenceChooser structuralReferenceChooser = new ReferenceChooser() {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3193
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3194
        @Override
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3195
        ReferenceLookupResult boundResult(ReferenceLookupResult boundRes) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3196
            return (!boundRes.isSuccess() || !boundRes.hasKind(StaticKind.STATIC)) ?
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3197
                    boundRes : //the search has at least one applicable non-static method
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3198
                    ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.sym, false));
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3199
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3200
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3201
        @Override
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3202
        ReferenceLookupResult unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3203
            if (boundRes.isSuccess() && !boundRes.hasKind(StaticKind.NON_STATIC)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3204
                //the first serach has at least one applicable static method
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3205
                return boundRes;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3206
            } else if (unboundRes.isSuccess() && !unboundRes.hasKind(StaticKind.STATIC)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3207
                //the second search has at least one applicable non-static method
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3208
                return unboundRes;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3209
            } else if (boundRes.isSuccess() || unboundRes.isSuccess()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3210
                //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
  3211
                //a non-static method (error recovery)
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3212
                return ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.isSuccess() ?
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3213
                        boundRes.sym : unboundRes.sym, true));
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3214
            } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3215
                //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
  3216
                return (boundRes.canIgnore() && !unboundRes.canIgnore()) ?
47297
a0116bcc65b7 8188144: regression in method reference type-checking
mcimadamore
parents: 47268
diff changeset
  3217
                        unboundRes : boundRes;
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3218
            }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3219
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3220
    };
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  3221
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3222
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3223
     * Helper for defining custom method-like lookup logic; a lookup helper
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3224
     * provides hooks for (i) the actual lookup logic and (ii) accessing the
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3225
     * lookup result (this step might result in compiler diagnostics to be generated)
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3226
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3227
    abstract class LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3228
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3229
        /** name of the symbol to lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3230
        Name name;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3231
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3232
        /** location in which the lookup takes place */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3233
        Type site;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3234
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3235
        /** actual types used during the lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3236
        List<Type> argtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3237
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3238
        /** type arguments used during the lookup */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3239
        List<Type> typeargtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3240
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3241
        /** Max overload resolution phase handled by this helper */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3242
        MethodResolutionPhase maxPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3243
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3244
        LookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3245
            this.name = name;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3246
            this.site = site;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3247
            this.argtypes = argtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3248
            this.typeargtypes = typeargtypes;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3249
            this.maxPhase = maxPhase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3250
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3251
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3252
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3253
         * Should lookup stop at given phase with given result
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3254
         */
26533
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  3255
        final boolean shouldStop(Symbol sym, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3256
            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
  3257
                !sym.kind.isResolutionError() || sym.kind == AMBIGUOUS;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3258
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3259
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3260
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3261
         * Search for a symbol under a given overload resolution phase - this method
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3262
         * is usually called several times, once per each overload resolution phase
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3263
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3264
        abstract Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3265
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3266
        /**
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3267
         * Dump overload resolution info
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3268
         */
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3269
        void debug(DiagnosticPosition pos, Symbol sym) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3270
            //do nothing
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3271
        }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3272
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3273
        /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3274
         * Validate the result of the lookup
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3275
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3276
        abstract Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3277
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3278
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3279
    abstract class BasicLookupHelper extends LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3280
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3281
        BasicLookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes) {
17804
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  3282
            this(name, site, argtypes, typeargtypes, MethodResolutionPhase.VARARITY);
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  3283
        }
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  3284
6bed8a263318 8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents: 17582
diff changeset
  3285
        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
  3286
            super(name, site, argtypes, typeargtypes, maxPhase);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3287
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3288
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3289
        @Override
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3290
        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3291
            Symbol sym = doLookup(env, phase);
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3292
            if (sym.kind == AMBIGUOUS) {
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  3293
                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3294
                sym = a_err.mergeAbstracts(site);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3295
            }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3296
            return sym;
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3297
        }
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3298
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3299
        abstract Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3300
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3301
        @Override
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3302
        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
  3303
            if (sym.kind.isResolutionError()) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3304
                //if nothing is found return the 'first' error
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3305
                sym = accessMethod(sym, pos, location, site, name, true, argtypes, typeargtypes);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3306
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3307
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3308
        }
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3309
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3310
        @Override
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3311
        void debug(DiagnosticPosition pos, Symbol sym) {
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3312
            reportVerboseResolutionDiagnostic(pos, name, site, argtypes, typeargtypes, sym);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3313
        }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3314
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3315
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3316
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3317
     * Helper class for member reference lookup. A reference lookup helper
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3318
     * defines the basic logic for member reference lookup; a method gives
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3319
     * access to an 'unbound' helper used to perform an unbound member
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3320
     * reference lookup.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3321
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3322
    abstract class ReferenceLookupHelper extends LookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3323
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3324
        /** The member reference tree */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3325
        JCMemberReference referenceTree;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3326
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3327
        ReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3328
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3329
            super(name, site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3330
            this.referenceTree = referenceTree;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3331
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3332
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3333
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3334
         * Returns an unbound version of this lookup helper. By default, this
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3335
         * method returns an dummy lookup helper.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3336
         */
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3337
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3338
            return null;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3339
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3340
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3341
        /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3342
         * Get the kind of the member reference
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3343
         */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3344
        abstract JCMemberReference.ReferenceKind referenceKind(Symbol sym);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3345
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3346
        Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3347
            if (sym.kind == AMBIGUOUS) {
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  3348
                AmbiguityError a_err = (AmbiguityError)sym.baseSymbol();
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3349
                sym = a_err.mergeAbstracts(site);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  3350
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3351
            //skip error reporting
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3352
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3353
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3354
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3355
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3356
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3357
     * Helper class for method reference lookup. The lookup logic is based
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3358
     * upon Resolve.findMethod; in certain cases, this helper class has a
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3359
     * corresponding unbound helper class (see UnboundMethodReferenceLookupHelper).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3360
     * In such cases, non-static lookup results are thrown away.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3361
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3362
    class MethodReferenceLookupHelper extends ReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3363
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3364
        /** The original method reference lookup site. */
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3365
        Type originalSite;
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3366
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3367
        MethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3368
                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
  3369
            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
  3370
            this.originalSite = site;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3371
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3372
16323
c4409c235642 8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents: 16322
diff changeset
  3373
        @Override
c4409c235642 8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents: 16322
diff changeset
  3374
        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3375
            return findMethod(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3376
                    phase.isBoxingRequired(), phase.isVarargsRequired());
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3377
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3378
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3379
        @Override
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3380
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3381
            if (TreeInfo.isStaticSelector(referenceTree.expr, names)) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3382
                if (argtypes.nonEmpty() &&
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3383
                        (argtypes.head.hasTag(NONE) ||
42974
ae7decb33b43 8169091: Method reference T::methodName for generic type T does not compile any more
mcimadamore
parents: 42828
diff changeset
  3384
                        types.isSubtypeUnchecked(inferenceContext.asUndetVar(argtypes.head), originalSite))) {
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3385
                    return new UnboundMethodReferenceLookupHelper(referenceTree, name,
29292
c10d63c667cd 8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents: 29146
diff changeset
  3386
                            originalSite, argtypes, typeargtypes, maxPhase);
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3387
                } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3388
                    return new ReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3389
                        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3390
                        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3391
                            return this;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3392
                        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3393
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3394
                        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3395
                        Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3396
                            return methodNotFound;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3397
                        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3398
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3399
                        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3400
                        ReferenceKind referenceKind(Symbol sym) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3401
                            Assert.error();
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3402
                            return null;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3403
                        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3404
                    };
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3405
                }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3406
            } else {
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3407
                return super.unboundLookup(inferenceContext);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3408
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3409
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3410
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3411
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3412
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3413
            if (sym.isStatic()) {
14724
b542db73539a 8004101: Add checks for method reference well-formedness
mcimadamore
parents: 14547
diff changeset
  3414
                return ReferenceKind.STATIC;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3415
            } else {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3416
                Name selName = TreeInfo.name(referenceTree.getQualifierExpression());
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3417
                return selName != null && selName == names._super ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3418
                        ReferenceKind.SUPER :
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3419
                        ReferenceKind.BOUND;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3420
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3421
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3422
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3423
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3424
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3425
     * Helper class for unbound method reference lookup. Essentially the same
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3426
     * as the basic method reference lookup helper; main difference is that static
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3427
     * lookup results are thrown away. If qualifier type is raw, an attempt to
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3428
     * infer a parameterized type is made using the first actual argument (that
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3429
     * would otherwise be ignored during the lookup).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3430
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3431
    class UnboundMethodReferenceLookupHelper extends MethodReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3432
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3433
        UnboundMethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3434
                List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  3435
            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
  3436
            if (site.isRaw() && !argtypes.head.hasTag(NONE)) {
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3437
                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
  3438
                this.site = types.skipTypeVars(asSuperSite, true);
16294
0c291a3cd60d 8007462: Fix provisional applicability for method references
mcimadamore
parents: 15706
diff changeset
  3439
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3440
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3441
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3442
        @Override
18910
c967bfda9283 8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents: 18668
diff changeset
  3443
        ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3444
            return this;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3445
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3446
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3447
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3448
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3449
            return ReferenceKind.UNBOUND;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3450
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3451
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3452
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3453
    /**
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3454
     * Helper class for array constructor lookup; an array constructor lookup
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3455
     * 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
  3456
     * 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
  3457
     */
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3458
    class ArrayConstructorReferenceLookupHelper extends ReferenceLookupHelper {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3459
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3460
        ArrayConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes,
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3461
                List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3462
            super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase);
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3463
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3464
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3465
        @Override
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3466
        protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  3467
            WriteableScope sc = WriteableScope.create(syms.arrayClass);
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3468
            MethodSymbol arrayConstr = new MethodSymbol(PUBLIC, name, null, site.tsym);
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42827
diff changeset
  3469
            arrayConstr.type = new MethodType(List.of(syms.intType), site, List.nil(), syms.methodClass);
15360
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3470
            sc.enter(arrayConstr);
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3471
            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
  3472
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3473
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3474
        @Override
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3475
        ReferenceKind referenceKind(Symbol sym) {
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3476
            return ReferenceKind.ARRAY_CTOR;
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3477
        }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3478
    }
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3479
450af2a9e3c9 8005854: Add support for array constructor references
mcimadamore
parents: 15038
diff changeset
  3480
    /**
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3481
     * Helper class for constructor reference lookup. The lookup logic is based
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3482
     * upon either Resolve.findMethod or Resolve.findDiamond - depending on
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3483
     * whether the constructor reference needs diamond inference (this is the case
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3484
     * if the qualifier type is raw). A special erroneous symbol is returned
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3485
     * if the lookup returns the constructor of an inner class and there's no
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3486
     * enclosing instance in scope.
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3487
     */
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3488
    class ConstructorReferenceLookupHelper extends ReferenceLookupHelper {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3489
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3490
        boolean needsInference;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3491
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3492
        ConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3493
                List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3494
            super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3495
            if (site.isRaw()) {
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26533
diff changeset
  3496
                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
  3497
                needsInference = true;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3498
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3499
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3500
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3501
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3502
        protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3503
            Symbol sym = needsInference ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3504
                findDiamond(env, site, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) :
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3505
                findMethod(env, site, name, argtypes, typeargtypes,
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3506
                        phase.isBoxingRequired(), phase.isVarargsRequired());
33019
2dc64d1f5e18 8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents: 32951
diff changeset
  3507
            return enclosingInstanceMissing(env, site) ? new BadConstructorReferenceError(sym) : sym;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3508
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3509
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3510
        @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3511
        ReferenceKind referenceKind(Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3512
            return site.getEnclosingType().hasTag(NONE) ?
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3513
                    ReferenceKind.TOPLEVEL : ReferenceKind.IMPLICIT_INNER;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3514
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3515
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3516
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3517
    /**
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3518
     * Main overload resolution routine. On each overload resolution step, a
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3519
     * lookup helper class is used to perform the method/constructor lookup;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3520
     * at the end of the lookup, the helper is used to validate the results
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3521
     * (this last step might trigger overload resolution diagnostics).
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3522
     */
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3523
    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
  3524
        MethodResolutionContext resolveContext = new MethodResolutionContext();
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3525
        resolveContext.methodCheck = methodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  3526
        return lookupMethod(env, pos, location, resolveContext, lookupHelper);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3527
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3528
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3529
    Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location,
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3530
            MethodResolutionContext resolveContext, LookupHelper lookupHelper) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3531
        MethodResolutionContext prevResolutionContext = currentResolutionContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3532
        try {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3533
            Symbol bestSoFar = methodNotFound;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3534
            currentResolutionContext = resolveContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3535
            for (MethodResolutionPhase phase : methodResolutionSteps) {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25443
diff changeset
  3536
                if (lookupHelper.shouldStop(bestSoFar, phase))
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25443
diff changeset
  3537
                    break;
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3538
                MethodResolutionPhase prevPhase = currentResolutionContext.step;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3539
                Symbol prevBest = bestSoFar;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3540
                currentResolutionContext.step = phase;
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3541
                Symbol sym = lookupHelper.lookup(env, phase);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3542
                lookupHelper.debug(pos, sym);
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  3543
                bestSoFar = phase.mergeResults(bestSoFar, sym);
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3544
                env.info.pendingResolutionPhase = (prevBest == bestSoFar) ? prevPhase : phase;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3545
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3546
            return lookupHelper.access(env, pos, location, bestSoFar);
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3547
        } finally {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3548
            currentResolutionContext = prevResolutionContext;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3549
        }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3550
    }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3551
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  3552
    /**
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3553
     * Resolve `c.name' where name == this or name == super.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3554
     * @param pos           The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3555
     * @param env           The environment current at the expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3556
     * @param c             The qualifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3557
     * @param name          The identifier's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3558
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3559
    Symbol resolveSelf(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3560
                       Env<AttrContext> env,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3561
                       TypeSymbol c,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3562
                       Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3563
        Env<AttrContext> env1 = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3564
        boolean staticOnly = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3565
        while (env1.outer != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3566
            if (isStatic(env1)) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3567
            if (env1.enclClass.sym == c) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  3568
                Symbol sym = env1.info.scope.findFirst(name);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3569
                if (sym != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3570
                    if (staticOnly) sym = new StaticError(sym);
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  3571
                    return accessBase(sym, pos, env.enclClass.sym.type,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3572
                                  name, true);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3573
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3574
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3575
            if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3576
            env1 = env1.outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3577
        }
23105
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  3578
        if (c.isInterface() &&
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  3579
            name == names._super && !isStatic(env) &&
1d1ea26a10ae 8030855: Default methods should be visible under source previous to 8
vromero
parents: 22442
diff changeset
  3580
            types.isDirectSuperInterface(c, env.enclClass.sym)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3581
            //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
  3582
            for (Type t : pruneInterfaces(env.enclClass.type)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3583
                if (t.tsym == c) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3584
                    env.info.defaultSuperCallSite = t;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3585
                    return new VarSymbol(0, names._super,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3586
                            types.asSuper(env.enclClass.type, c), env.enclClass.sym);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3587
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3588
            }
39092
399acd370763 8058244: missing error in qualified default super call
vromero
parents: 38914
diff changeset
  3589
            //find a direct super type that is a subtype of 'c'
399acd370763 8058244: missing error in qualified default super call
vromero
parents: 38914
diff changeset
  3590
            for (Type i : types.directSupertypes(env.enclClass.type)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3591
                if (i.tsym.isSubClass(c, types) && i.tsym != c) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3592
                    log.error(pos,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3593
                              Errors.IllegalDefaultSuperCall(c,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3594
                                                             Fragments.RedundantSupertype(c, i)));
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3595
                    return syms.errSymbol;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3596
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3597
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3598
            Assert.error();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3599
        }
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3600
        log.error(pos, Errors.NotEnclClass(c));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3601
        return syms.errSymbol;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3602
    }
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3603
    //where
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3604
    private List<Type> pruneInterfaces(Type t) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19940
diff changeset
  3605
        ListBuffer<Type> result = new ListBuffer<>();
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3606
        for (Type t1 : types.interfaces(t)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3607
            boolean shouldAdd = true;
39092
399acd370763 8058244: missing error in qualified default super call
vromero
parents: 38914
diff changeset
  3608
            for (Type t2 : types.directSupertypes(t)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3609
                if (t1 != t2 && types.isSubtypeNoCapture(t2, t1)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3610
                    shouldAdd = false;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3611
                }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3612
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3613
            if (shouldAdd) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3614
                result.append(t1);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3615
            }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3616
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3617
        return result.toList();
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3618
    }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3619
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3620
06bc494ca11e Initial load
duke
parents:
diff changeset
  3621
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  3622
     * Resolve `c.this' for an enclosing class c that contains the
06bc494ca11e Initial load
duke
parents:
diff changeset
  3623
     * named member.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3624
     * @param pos           The position to use for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3625
     * @param env           The environment current at the expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3626
     * @param member        The member that must be contained in the result.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3627
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3628
    Symbol resolveSelfContaining(DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3629
                                 Env<AttrContext> env,
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3630
                                 Symbol member,
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3631
                                 boolean isSuperCall) {
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3632
        Symbol sym = resolveSelfContainingInternal(env, member, isSuperCall);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3633
        if (sym == null) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3634
            log.error(pos, Errors.EnclClassRequired(member));
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3635
            return syms.errSymbol;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3636
        } else {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3637
            return accessBase(sym, pos, env.enclClass.sym.type, sym.name, true);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3638
        }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3639
    }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3640
33019
2dc64d1f5e18 8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents: 32951
diff changeset
  3641
    boolean enclosingInstanceMissing(Env<AttrContext> env, Type type) {
2dc64d1f5e18 8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents: 32951
diff changeset
  3642
        if (type.hasTag(CLASS) && type.getEnclosingType().hasTag(CLASS)) {
2dc64d1f5e18 8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents: 32951
diff changeset
  3643
            Symbol encl = resolveSelfContainingInternal(env, type.tsym, false);
2dc64d1f5e18 8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents: 32951
diff changeset
  3644
            return encl == null || encl.kind.isResolutionError();
2dc64d1f5e18 8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents: 32951
diff changeset
  3645
        }
2dc64d1f5e18 8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents: 32951
diff changeset
  3646
        return false;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3647
    }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3648
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3649
    private Symbol resolveSelfContainingInternal(Env<AttrContext> env,
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3650
                                 Symbol member,
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3651
                                 boolean isSuperCall) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3652
        Name name = names._this;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3653
        Env<AttrContext> env1 = isSuperCall ? env.outer : env;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3654
        boolean staticOnly = false;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3655
        if (env1 != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3656
            while (env1 != null && env1.outer != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3657
                if (isStatic(env1)) staticOnly = true;
34561
79c436257611 8144673: Suspect message regarding suitable enclosing instance not being in scope
sadayapalam
parents: 33019
diff changeset
  3658
                if (env1.enclClass.sym.isSubClass(member.owner.enclClass(), types)) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25435
diff changeset
  3659
                    Symbol sym = env1.info.scope.findFirst(name);
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3660
                    if (sym != null) {
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3661
                        if (staticOnly) sym = new StaticError(sym);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3662
                        return sym;
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3663
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3664
                }
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3665
                if ((env1.enclClass.sym.flags() & STATIC) != 0)
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3666
                    staticOnly = true;
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3667
                env1 = env1.outer;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3668
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3669
        }
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3670
        return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3671
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3672
06bc494ca11e Initial load
duke
parents:
diff changeset
  3673
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  3674
     * 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
  3675
     * JLS 8.8.5.1 and 15.9.2
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3676
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3677
    Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t) {
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3678
        return resolveImplicitThis(pos, env, t, false);
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3679
    }
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3680
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3681
    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
  3682
        Type thisType = (t.tsym.owner.kind.matches(KindSelector.VAL_MTH)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3683
                         ? resolveSelf(pos, env, t.getEnclosingType().tsym, names._this)
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8430
diff changeset
  3684
                         : resolveSelfContaining(pos, env, t.tsym, isSuperCall)).type;
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3685
        if (env.info.isSelfCall && thisType.tsym == env.enclClass.sym) {
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3686
            log.error(pos, Errors.CantRefBeforeCtorCalled("this"));
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3687
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3688
        return thisType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3689
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3690
06bc494ca11e Initial load
duke
parents:
diff changeset
  3691
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  3692
 *  ResolveError classes, indicating error situations when accessing symbols
06bc494ca11e Initial load
duke
parents:
diff changeset
  3693
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  3694
12082
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3695
    //used by TransTypes when checking target type of synthetic cast
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3696
    public void logAccessErrorInternal(Env<AttrContext> env, JCTree tree, Type type) {
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3697
        AccessError error = new AccessError(env, env.enclClass.type, type.tsym);
32bdf6ef6388 7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents: 12078
diff changeset
  3698
        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
  3699
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3700
    //where
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3701
    private void logResolveError(ResolveError error,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3702
            DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3703
            Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3704
            Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3705
            Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3706
            List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3707
            List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3708
        JCDiagnostic d = error.getDiagnostic(JCDiagnostic.DiagnosticType.ERROR,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3709
                pos, location, site, name, argtypes, typeargtypes);
6356
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3710
        if (d != null) {
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3711
            d.setFlag(DiagnosticFlag.RESOLVE_ERROR);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3712
            log.report(d);
6356
af24929939ca 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents: 6344
diff changeset
  3713
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3714
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3715
1534
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3716
    private final LocalizedString noArgs = new LocalizedString("compiler.misc.no.args");
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3717
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3718
    public Object methodArguments(List<Type> argtypes) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3719
        if (argtypes == null || argtypes.isEmpty()) {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3720
            return noArgs;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3721
        } else {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19940
diff changeset
  3722
            ListBuffer<Object> diagArgs = new ListBuffer<>();
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3723
            for (Type t : argtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  3724
                if (t.hasTag(DEFERRED)) {
14058
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3725
                    diagArgs.append(((DeferredAttr.DeferredType)t).tree);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3726
                } else {
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3727
                    diagArgs.append(t);
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3728
                }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3729
            }
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3730
            return diagArgs;
c7ec7facdd20 7177385: Add attribution support for lambda expressions
mcimadamore
parents: 14057
diff changeset
  3731
        }
1534
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3732
    }
e923a41e84cc 6758789: Some method resolution diagnostic should be improved
mcimadamore
parents: 1533
diff changeset
  3733
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3734
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3735
     * Root class for resolution errors. Subclass of ResolveError
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3736
     * represent a different kinds of resolution error - as such they must
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3737
     * specify how they map into concrete compiler diagnostics.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3738
     */
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3739
    abstract class ResolveError extends Symbol {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3740
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3741
        /** The name of the kind of error, for debugging only. */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3742
        final String debugName;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3743
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3744
        ResolveError(Kind kind, String debugName) {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3745
            super(kind, 0, null, null, null);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3746
            this.debugName = debugName;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3747
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3748
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  3749
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3750
        public <R, P> R accept(ElementVisitor<R, P> v, P p) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3751
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3752
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3753
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3754
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3755
        public String toString() {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3756
            return debugName;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3757
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3758
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3759
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3760
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3761
            return false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3762
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3763
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3764
        @Override
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3765
        public boolean isStatic() {
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3766
            return false;
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3767
        }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3768
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3769
        /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3770
         * Create an external representation for this erroneous symbol to be
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3771
         * used during attribution - by default this returns the symbol of a
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3772
         * brand new error type which stores the original type found
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3773
         * during resolution.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3774
         *
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3775
         * @param name     the name used during resolution
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3776
         * @param location the location from which the symbol is accessed
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3777
         */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3778
        protected Symbol access(Name name, TypeSymbol location) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3779
            return types.createErrorType(name, location, syms.errSymbol.type).tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3780
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3781
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3782
        /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3783
         * Create a diagnostic representing this resolution error.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3784
         *
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3785
         * @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
  3786
         * @param pos       The position to be used for error reporting.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3787
         * @param site      The original type from where the selection took place.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3788
         * @param name      The name of the symbol to be resolved.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3789
         * @param argtypes  The invocation's value arguments,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3790
         *                  if we looked for a method.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3791
         * @param typeargtypes  The invocation's type arguments,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3792
         *                      if we looked for a method.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3793
         */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3794
        abstract JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3795
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3796
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3797
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3798
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3799
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3800
                List<Type> typeargtypes);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3801
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3802
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3803
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3804
     * 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
  3805
     * an invalid symbol being found during resolution.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3806
     */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3807
    abstract class InvalidSymbolError extends ResolveError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3808
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3809
        /** The invalid symbol found during resolution */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3810
        Symbol sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3811
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3812
        InvalidSymbolError(Kind kind, Symbol sym, String debugName) {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3813
            super(kind, debugName);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3814
            this.sym = sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3815
        }
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
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3818
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3819
            return true;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3820
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3821
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3822
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3823
        public String toString() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3824
             return super.toString() + " wrongSym=" + sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3825
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3826
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3827
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3828
        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
  3829
            if (!sym.kind.isResolutionError() && sym.kind.matches(KindSelector.TYP))
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3830
                return types.createErrorType(name, location, sym.type).tsym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3831
            else
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3832
                return sym;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3833
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3834
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3835
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3836
    class BadVarTypeError extends ResolveError {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3837
        BadVarTypeError() {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3838
            super(Kind.BAD_VAR, "bad var use");
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3839
        }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3840
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3841
        @Override
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3842
        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
50675
273183fd8246 8195293: Issue more comprehensive warnings for use of \"var\" in earlier source versions
mcimadamore
parents: 50592
diff changeset
  3843
            return diags.create(dkind, log.currentSource(), pos, "illegal.ref.to.var.type");
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3844
        }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3845
    }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
  3846
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3847
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3848
     * InvalidSymbolError error class indicating that a symbol matching a
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3849
     * given name does not exists in a given site.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3850
     */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3851
    class SymbolNotFoundError extends ResolveError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3852
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3853
        SymbolNotFoundError(Kind kind) {
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3854
            this(kind, "symbol not found error");
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3855
        }
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3856
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3857
        SymbolNotFoundError(Kind kind, String debugName) {
21718
74a5882faf79 8026231: Look at 'static' flag when checking method references
vromero
parents: 21024
diff changeset
  3858
            super(kind, debugName);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3859
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3860
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3861
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3862
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3863
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3864
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3865
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3866
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3867
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3868
                List<Type> typeargtypes) {
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42827
diff changeset
  3869
            argtypes = argtypes == null ? List.nil() : argtypes;
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42827
diff changeset
  3870
            typeargtypes = typeargtypes == null ? List.nil() : typeargtypes;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3871
            if (name == names.error)
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3872
                return null;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3873
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3874
            boolean hasLocation = false;
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3875
            if (location == null) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3876
                location = site.tsym;
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3877
            }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3878
            if (!location.name.isEmpty()) {
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3879
                if (location.kind == PCK && !site.tsym.exists()) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3880
                    return diags.create(dkind, log.currentSource(), pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3881
                        "doesnt.exist", location);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3882
                }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3883
                hasLocation = !location.name.equals(names._this) &&
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3884
                        !location.name.equals(names._super);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3885
            }
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  3886
            boolean isConstructor = name == names.init;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3887
            KindName kindname = isConstructor ? KindName.CONSTRUCTOR : kind.absentKind();
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3888
            Name idname = isConstructor ? site.tsym.name : name;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3889
            String errKey = getErrorKey(kindname, typeargtypes.nonEmpty(), hasLocation);
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3890
            if (hasLocation) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3891
                return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3892
                        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
  3893
                        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
  3894
                        getLocationDiag(location, site)); //location kindname, type
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3895
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3896
            else {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  3897
                return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3898
                        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
  3899
                        typeargtypes, args(argtypes)); //type parameters and arguments (if any)
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3900
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3901
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3902
        //where
14953
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3903
        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
  3904
            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
  3905
        }
89a34297b198 8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents: 14801
diff changeset
  3906
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3907
        private String getErrorKey(KindName kindname, boolean hasTypeArgs, boolean hasLocation) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3908
            String key = "cant.resolve";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3909
            String suffix = hasLocation ? ".location" : "";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3910
            switch (kindname) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3911
                case METHOD:
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3912
                case CONSTRUCTOR: {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3913
                    suffix += ".args";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3914
                    suffix += hasTypeArgs ? ".params" : "";
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3915
                }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3916
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3917
            return key + suffix;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3918
        }
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3919
        private JCDiagnostic getLocationDiag(Symbol location, Type site) {
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3920
            if (location.kind == VAR) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3921
                return diags.fragment(Fragments.Location1(kindName(location),
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3922
                                                          location,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3923
                                                          location.type));
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3924
            } else {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3925
                return diags.fragment(Fragments.Location(typeKindName(site),
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3926
                                      site,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  3927
                                      null));
8239
d2c934e951e2 7014715: javac returns different error code for certain failure(s)
mcimadamore
parents: 8237
diff changeset
  3928
            }
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3929
        }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3930
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3931
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3932
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3933
     * InvalidSymbolError error class indicating that a given symbol
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3934
     * (either a method, a constructor or an operand) is not applicable
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3935
     * given an actual arguments/type argument list.
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3936
     */
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3937
    class InapplicableSymbolError extends ResolveError {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3938
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3939
        protected MethodResolutionContext resolveContext;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3940
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3941
        InapplicableSymbolError(MethodResolutionContext context) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3942
            this(WRONG_MTH, "inapplicable symbol error", context);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3943
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3944
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  3945
        protected InapplicableSymbolError(Kind kind, String debugName, MethodResolutionContext context) {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3946
            super(kind, debugName);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  3947
            this.resolveContext = context;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3948
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3949
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3950
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3951
        public String toString() {
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3952
            return super.toString();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3953
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3954
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3955
        @Override
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3956
        public boolean exists() {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  3957
            return true;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3958
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3959
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3960
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3961
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3962
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  3963
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3964
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3965
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3966
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3967
                List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3968
            if (name == names.error)
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3969
                return null;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3970
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3971
            Pair<Symbol, JCDiagnostic> c = errCandidate();
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3972
            if (compactMethodDiags) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3973
                JCDiagnostic simpleDiag =
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3974
                    MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, c.snd);
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3975
                if (simpleDiag != null) {
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3976
                    return simpleDiag;
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3977
                }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3978
            }
29051
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3979
            Symbol ws = c.fst.asMemberOf(site, types);
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3980
            return diags.create(dkind, log.currentSource(), pos,
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3981
                      "cant.apply.symbol",
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3982
                      kindName(ws),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3983
                      ws.name == names.init ? ws.owner.name : ws.name,
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3984
                      methodArguments(ws.type.getParameterTypes()),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3985
                      methodArguments(argtypes),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3986
                      kindName(ws.owner),
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3987
                      ws.owner.type,
7244db2ab176 8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents: 28456
diff changeset
  3988
                      c.snd);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3989
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3990
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3991
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3992
        public Symbol access(Name name, TypeSymbol location) {
50898
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  3993
            Symbol sym = bestCandidate();
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  3994
            return types.createErrorType(name, location, sym != null ? sym.type : syms.errSymbol.type).tsym;
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  3995
        }
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  3996
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  3997
        protected Symbol bestCandidate() {
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  3998
            return errCandidate().fst;
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  3999
        }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4000
18913
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4001
        protected Pair<Symbol, JCDiagnostic> errCandidate() {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4002
            Candidate bestSoFar = null;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4003
            for (Candidate c : resolveContext.candidates) {
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4004
                if (c.isApplicable()) continue;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4005
                bestSoFar = c;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4006
            }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4007
            Assert.checkNonNull(bestSoFar);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  4008
            return new Pair<>(bestSoFar.sym, bestSoFar.details);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4009
        }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4010
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4011
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4012
    /**
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4013
     * 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
  4014
     * is not applicable given an actual arguments/type argument list.
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4015
     */
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4016
    class InapplicableSymbolsError extends InapplicableSymbolError {
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4017
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4018
        InapplicableSymbolsError(MethodResolutionContext context) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4019
            super(WRONG_MTHS, "inapplicable symbols", context);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4020
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4021
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4022
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4023
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4024
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  4025
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4026
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4027
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4028
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4029
                List<Type> typeargtypes) {
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4030
            Map<Symbol, JCDiagnostic> candidatesMap = mapCandidates();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  4031
            Map<Symbol, JCDiagnostic> filteredCandidates = compactMethodDiags ?
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  4032
                    filterCandidates(candidatesMap) :
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  4033
                    mapCandidates();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4034
            if (filteredCandidates.isEmpty()) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4035
                filteredCandidates = candidatesMap;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4036
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4037
            boolean truncatedDiag = candidatesMap.size() != filteredCandidates.size();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4038
            if (filteredCandidates.size() > 1) {
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4039
                JCDiagnostic err = diags.create(dkind,
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4040
                        null,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4041
                        truncatedDiag ?
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4042
                            EnumSet.of(DiagnosticFlag.COMPRESSED) :
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4043
                            EnumSet.noneOf(DiagnosticFlag.class),
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4044
                        log.currentSource(),
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4045
                        pos,
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4046
                        "cant.apply.symbols",
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26991
diff changeset
  4047
                        name == names.init ? KindName.CONSTRUCTOR : kind.absentKind(),
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4048
                        name == names.init ? site.tsym.name : name,
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
  4049
                        methodArguments(argtypes));
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4050
                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
  4051
            } else if (filteredCandidates.size() == 1) {
18913
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4052
                Map.Entry<Symbol, JCDiagnostic> _e =
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4053
                                filteredCandidates.entrySet().iterator().next();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  4054
                final Pair<Symbol, JCDiagnostic> p = new Pair<>(_e.getKey(), _e.getValue());
18913
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4055
                JCDiagnostic d = new InapplicableSymbolError(resolveContext) {
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4056
                    @Override
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4057
                    protected Pair<Symbol, JCDiagnostic> errCandidate() {
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4058
                        return p;
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4059
                    }
a29ea2022929 8020286: Wrong diagnostic after compaction
mcimadamore
parents: 18911
diff changeset
  4060
                }.getDiagnostic(dkind, pos,
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4061
                    location, site, name, argtypes, typeargtypes);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4062
                if (truncatedDiag) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4063
                    d.setFlag(DiagnosticFlag.COMPRESSED);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4064
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4065
                return d;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4066
            } else {
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4067
                return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind, pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  4068
                    location, site, name, argtypes, typeargtypes);
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4069
            }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4070
        }
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4071
        //where
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4072
            private Map<Symbol, JCDiagnostic> mapCandidates() {
47298
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4073
                MostSpecificMap candidates = new MostSpecificMap();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4074
                for (Candidate c : resolveContext.candidates) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4075
                    if (c.isApplicable()) continue;
47298
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4076
                    candidates.put(c);
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4077
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4078
                return candidates;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4079
            }
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4080
47298
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4081
            @SuppressWarnings("serial")
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4082
            private class MostSpecificMap extends LinkedHashMap<Symbol, JCDiagnostic> {
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4083
                private void put(Candidate c) {
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4084
                    ListBuffer<Symbol> overridden = new ListBuffer<>();
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4085
                    for (Symbol s : keySet()) {
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4086
                        if (s == c.sym) {
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4087
                            continue;
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4088
                        }
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4089
                        if (c.sym.overrides(s, (TypeSymbol)s.owner, types, false)) {
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4090
                            overridden.add(s);
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4091
                        } else if (s.overrides(c.sym, (TypeSymbol)c.sym.owner, types, false)) {
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4092
                            return;
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4093
                        }
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4094
                    }
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4095
                    for (Symbol s : overridden) {
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4096
                        remove(s);
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4097
                    }
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4098
                    put(c.sym, c.details);
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4099
                }
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4100
            }
2e947e1bd907 8187978: javac can show overload error messages that include non-valid candidates
vromero
parents: 47297
diff changeset
  4101
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4102
            Map<Symbol, JCDiagnostic> filterCandidates(Map<Symbol, JCDiagnostic> candidatesMap) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  4103
                Map<Symbol, JCDiagnostic> candidates = new LinkedHashMap<>();
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4104
                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
  4105
                    JCDiagnostic d = _entry.getValue();
19129
b1409ae675f8 8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents: 18914
diff changeset
  4106
                    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
  4107
                        candidates.put(_entry.getKey(), d);
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
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4110
                return candidates;
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
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4113
            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
  4114
                List<JCDiagnostic> details = List.nil();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4115
                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
  4116
                    Symbol sym = _entry.getKey();
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  4117
                    JCDiagnostic detailDiag =
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  4118
                            diags.fragment(Fragments.InapplicableMethod(Kinds.kindName(sym),
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  4119
                                                                        sym.location(site, types),
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  4120
                                                                        sym.asMemberOf(site, types),
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  4121
                                                                        _entry.getValue()));
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4122
                    details = details.prepend(detailDiag);
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
                //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
  4125
                //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
  4126
                //conform to source order
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4127
                return details;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4128
            }
50898
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4129
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4130
        @Override
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4131
        protected Symbol bestCandidate() {
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4132
            Map<Symbol, JCDiagnostic> candidatesMap = mapCandidates();
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4133
            Map<Symbol, JCDiagnostic> filteredCandidates = filterCandidates(candidatesMap);
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4134
            if (filteredCandidates.size() == 1) {
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4135
                return filteredCandidates.keySet().iterator().next();
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4136
            }
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4137
            return null;
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 50675
diff changeset
  4138
        }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4139
    }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4140
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4141
    /**
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4142
     * 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
  4143
     * given an actual arguments/type argument list using diamond inference.
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
    class DiamondError extends InapplicableSymbolError {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4146
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4147
        Symbol sym;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4148
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4149
        public DiamondError(Symbol sym, MethodResolutionContext context) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4150
            super(sym.kind, "diamondError", context);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4151
            this.sym = sym;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4152
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4153
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4154
        JCDiagnostic getDetails() {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4155
            return (sym.kind == WRONG_MTH) ?
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4156
                    ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4157
                    null;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4158
        }
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
        @Override
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4161
        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4162
                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
  4163
            JCDiagnostic details = getDetails();
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4164
            if (details != null && compactMethodDiags) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4165
                JCDiagnostic simpleDiag =
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4166
                        MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, details);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4167
                if (simpleDiag != null) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4168
                    return simpleDiag;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4169
                }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4170
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4171
            String key = details == null ?
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4172
                "cant.apply.diamond" :
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4173
                "cant.apply.diamond.1";
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4174
            return diags.create(dkind, log.currentSource(), pos, key,
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44504
diff changeset
  4175
                    Fragments.Diamond(site.tsym), details);
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4176
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4177
    }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4178
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4179
    /**
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4180
     * An InvalidSymbolError error class indicating that a symbol is not
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4181
     * accessible from a given site
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4182
     */
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4183
    class AccessError extends InvalidSymbolError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4184
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4185
        private Env<AttrContext> env;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4186
        private Type site;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4187
06bc494ca11e Initial load
duke
parents:
diff changeset
  4188
        AccessError(Env<AttrContext> env, Type site, Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  4189
            super(HIDDEN, sym, "access error");
06bc494ca11e Initial load
duke
parents:
diff changeset
  4190
            this.env = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  4191
            this.site = site;
06bc494ca11e Initial load
duke
parents:
diff changeset
  4192
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4193
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4194
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4195
        public boolean exists() {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4196
            return false;
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4197
        }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4198
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4199
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4200
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4201
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  4202
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4203
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4204
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4205
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4206
                List<Type> typeargtypes) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4207
            if (sym.name == names.init && sym.owner != site.tsym) {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4208
                return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  4209
                        pos, location, site, name, argtypes, typeargtypes);
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4210
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4211
            else if ((sym.flags() & PUBLIC) != 0
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4212
                || (env != null && this.site != null
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4213
                    && !isAccessible(env, this.site))) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4214
                if (sym.owner.kind == PCK) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4215
                    return diags.create(dkind, log.currentSource(),
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4216
                            pos, "not.def.access.package.cant.access",
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4217
                        sym, sym.location(), inaccessiblePackageReason(env, sym.packge()));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4218
                } else if (   sym.packge() != syms.rootPackage
43866
3195ea126044 8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents: 43865
diff changeset
  4219
                           && !symbolPackageVisible(env, sym)) {
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4220
                    return diags.create(dkind, log.currentSource(),
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4221
                            pos, "not.def.access.class.intf.cant.access.reason",
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4222
                            sym, sym.location(), sym.location().packge(),
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4223
                            inaccessiblePackageReason(env, sym.packge()));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4224
                } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4225
                    return diags.create(dkind, log.currentSource(),
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4226
                            pos, "not.def.access.class.intf.cant.access",
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4227
                        sym, sym.location());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4228
                }
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4229
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4230
            else if ((sym.flags() & (PRIVATE | PROTECTED)) != 0) {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  4231
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4232
                        pos, "report.access", sym,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4233
                        asFlagSet(sym.flags() & (PRIVATE | PROTECTED)),
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4234
                        sym.location());
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4235
            }
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4236
            else {
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  4237
                return diags.create(dkind, log.currentSource(),
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4238
                        pos, "not.def.public.cant.access", sym, sym.location());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4239
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4240
        }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4241
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4242
        private String toString(Type type) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4243
            StringBuilder sb = new StringBuilder();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4244
            sb.append(type);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4245
            if (type != null) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4246
                sb.append("[tsym:").append(type.tsym);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4247
                if (type.tsym != null)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4248
                    sb.append("packge:").append(type.tsym.packge());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4249
                sb.append("]");
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4250
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4251
            return sb.toString();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36278
diff changeset
  4252
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4253
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4254
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4255
    class InvisibleSymbolError extends InvalidSymbolError {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4256
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4257
        private final Env<AttrContext> env;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4258
        private final boolean suppressError;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4259
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4260
        InvisibleSymbolError(Env<AttrContext> env, boolean suppressError, Symbol sym) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4261
            super(HIDDEN, sym, "invisible class error");
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4262
            this.env = env;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4263
            this.suppressError = suppressError;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4264
            this.name = sym.name;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4265
        }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4266
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4267
        @Override
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4268
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4269
                DiagnosticPosition pos,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4270
                Symbol location,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4271
                Type site,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4272
                Name name,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4273
                List<Type> argtypes,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4274
                List<Type> typeargtypes) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4275
            if (suppressError)
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4276
                return null;
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4277
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4278
            if (sym.kind == PCK) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4279
                JCDiagnostic details = inaccessiblePackageReason(env, sym.packge());
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4280
                return diags.create(dkind, log.currentSource(),
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4281
                        pos, "package.not.visible", sym, details);
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4282
            }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4283
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4284
            JCDiagnostic details = inaccessiblePackageReason(env, sym.packge());
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4285
43272
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4286
            if (pos.getTree() != null) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4287
                Symbol o = sym;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4288
                JCTree tree = pos.getTree();
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4289
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4290
                while (o.kind != PCK && tree.hasTag(SELECT)) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4291
                    o = o.owner;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4292
                    tree = ((JCFieldAccess) tree).selected;
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4293
                }
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4294
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4295
                if (o.kind == PCK) {
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4296
                    pos = tree.pos();
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4297
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4298
                    return diags.create(dkind, log.currentSource(),
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4299
                            pos, "package.not.visible", o, details);
421ae1e38d2d 8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents: 43138
diff changeset
  4300
                }
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4301
            }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4302
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4303
            return diags.create(dkind, log.currentSource(),
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4304
                    pos, "not.def.access.package.cant.access", sym, sym.packge(), details);
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4305
        }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4306
    }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4307
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4308
    JCDiagnostic inaccessiblePackageReason(Env<AttrContext> env, PackageSymbol sym) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4309
        //no dependency:
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4310
        if (!env.toplevel.modle.readModules.contains(sym.modle)) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4311
            //does not read:
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4312
            if (sym.modle != syms.unnamedModule) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4313
                if (env.toplevel.modle != syms.unnamedModule) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4314
                    return diags.fragment(Fragments.NotDefAccessDoesNotRead(env.toplevel.modle,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4315
                                                                            sym,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4316
                                                                            sym.modle));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4317
                } else {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4318
                    return diags.fragment(Fragments.NotDefAccessDoesNotReadFromUnnamed(sym,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4319
                                                                                       sym.modle));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4320
                }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4321
            } else {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4322
                return diags.fragment(Fragments.NotDefAccessDoesNotReadUnnamed(sym,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4323
                                                                               env.toplevel.modle));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4324
            }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4325
        } else {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4326
            if (sym.packge().modle.exports.stream().anyMatch(e -> e.packge == sym)) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4327
                //not exported to this module:
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4328
                if (env.toplevel.modle != syms.unnamedModule) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4329
                    return diags.fragment(Fragments.NotDefAccessNotExportedToModule(sym,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4330
                                                                                    sym.modle,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4331
                                                                                    env.toplevel.modle));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4332
                } else {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4333
                    return diags.fragment(Fragments.NotDefAccessNotExportedToModuleFromUnnamed(sym,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4334
                                                                                               sym.modle));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4335
                }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4336
            } else {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4337
                //not exported:
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4338
                if (env.toplevel.modle != syms.unnamedModule) {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4339
                    return diags.fragment(Fragments.NotDefAccessNotExported(sym,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4340
                                                                            sym.modle));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4341
                } else {
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4342
                    return diags.fragment(Fragments.NotDefAccessNotExportedFromUnnamed(sym,
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4343
                                                                                       sym.modle));
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4344
                }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4345
            }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4346
        }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4347
    }
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 43131
diff changeset
  4348
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4349
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4350
     * InvalidSymbolError error class indicating that an instance member
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4351
     * has erroneously been accessed from a static context.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4352
     */
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4353
    class StaticError extends InvalidSymbolError {
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4354
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4355
        StaticError(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  4356
            super(STATICERR, sym, "static error");
06bc494ca11e Initial load
duke
parents:
diff changeset
  4357
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4358
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4359
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4360
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4361
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  4362
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4363
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4364
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4365
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4366
                List<Type> typeargtypes) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14062
diff changeset
  4367
            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
  4368
                ? types.erasure(sym.type).tsym
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 735
diff changeset
  4369
                : sym);
6151
dd513881e71d 6957438: improve code for generating warning messages containing option names
jjg
parents: 5857
diff changeset
  4370
            return diags.create(dkind, log.currentSource(), pos,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4371
                    "non-static.cant.be.ref", kindName(sym), errSym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4372
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4373
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4374
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4375
    /**
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4376
     * InvalidSymbolError error class indicating that a pair of symbols
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4377
     * (either methods, constructors or operands) are ambiguous
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4378
     * given an actual arguments/type argument list.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4379
     */
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4380
    class AmbiguityError extends ResolveError {
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4381
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4382
        /** The other maximally specific symbol */
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4383
        List<Symbol> ambiguousSyms = List.nil();
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4384
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4385
        @Override
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4386
        public boolean exists() {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4387
            return true;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4388
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4389
06bc494ca11e Initial load
duke
parents:
diff changeset
  4390
        AmbiguityError(Symbol sym1, Symbol sym2) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4391
            super(AMBIGUOUS, "ambiguity error");
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4392
            ambiguousSyms = flatten(sym2).appendList(flatten(sym1));
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4393
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4394
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4395
        private List<Symbol> flatten(Symbol sym) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4396
            if (sym.kind == AMBIGUOUS) {
22161
d79fb23b5dca 8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents: 21718
diff changeset
  4397
                return ((AmbiguityError)sym.baseSymbol()).ambiguousSyms;
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4398
            } else {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4399
                return List.of(sym);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4400
            }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4401
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4402
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4403
        AmbiguityError addAmbiguousSymbol(Symbol s) {
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4404
            ambiguousSyms = ambiguousSyms.prepend(s);
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4405
            return this;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4406
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4407
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4408
        @Override
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4409
        JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4410
                DiagnosticPosition pos,
8045
df2ca0edfbaa 6968793: issues with diagnostics
mcimadamore
parents: 8036
diff changeset
  4411
                Symbol location,
3143
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4412
                Type site,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4413
                Name name,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4414
                List<Type> argtypes,
0413d5b5b7fd 6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents: 3140
diff changeset
  4415
                List<Type> typeargtypes) {
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4416
            List<Symbol> diagSyms = ambiguousSyms.reverse();
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4417
            Symbol s1 = diagSyms.head;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4418
            Symbol s2 = diagSyms.tail.head;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4419
            Name sname = s1.name;
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4420
            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
  4421
            return diags.create(dkind, log.currentSource(),
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4422
                    pos, "ref.ambiguous", sname,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4423
                    kindName(s1),
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4424
                    s1,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4425
                    s1.location(site, types),
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4426
                    kindName(s2),
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4427
                    s2,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4428
                    s2.location(site, types));
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4429
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4430
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4431
        /**
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4432
         * If multiple applicable methods are found during overload and none of them
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4433
         * is more specific than the others, attempt to merge their signatures.
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4434
         */
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4435
        Symbol mergeAbstracts(Type site) {
18668
1f99c1b43ab2 7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents: 18646
diff changeset
  4436
            List<Symbol> ambiguousInOrder = ambiguousSyms.reverse();
41526
265017792980 8167000: Refine handling of multiple maximally specific abstract methods
mcimadamore
parents: 39599
diff changeset
  4437
            return types.mergeAbstracts(ambiguousInOrder, site, true).orElse(this);
15038
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4438
        }
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4439
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4440
        @Override
3ad27d268874 8005179: Cleanup Resolve.AmbiguityError
mcimadamore
parents: 15037
diff changeset
  4441
        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
  4442
            Symbol firstAmbiguity = ambiguousSyms.last();
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  4443
            return firstAmbiguity.kind == TYP ?
f564dcca5525 8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents: 15360
diff changeset
  4444
                    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
  4445
                    firstAmbiguity;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4446
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  4447
    }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4448
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4449
    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
  4450
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4451
        ResolveError delegatedError;
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4452
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4453
        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
  4454
            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
  4455
            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
  4456
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4457
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4458
        @Override
16975
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4459
        public Symbol baseSymbol() {
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4460
            return delegatedError.baseSymbol();
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4461
        }
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4462
124c8436d59c 8010923: Avoid redundant speculative attribution
mcimadamore
parents: 16805
diff changeset
  4463
        @Override
16312
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4464
        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
  4465
            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
  4466
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4467
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4468
        @Override
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4469
        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
  4470
            return true;
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4471
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4472
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4473
        @Override
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4474
        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
  4475
            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
  4476
        }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4477
    }
7fb570abcb54 8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents: 16301
diff changeset
  4478
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4479
    /**
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4480
     * BadMethodReferenceError error class indicating that a method reference symbol has been found,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4481
     * but with the wrong staticness.
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4482
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4483
    class BadMethodReferenceError extends StaticError {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4484
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4485
        boolean unboundLookup;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4486
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4487
        public BadMethodReferenceError(Symbol sym, boolean unboundLookup) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4488
            super(sym);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4489
            this.unboundLookup = unboundLookup;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4490
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4491
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4492
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4493
        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
  4494
            final String key;
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4495
            if (!unboundLookup) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4496
                key = "bad.static.method.in.bound.lookup";
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4497
            } else if (sym.isStatic()) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4498
                key = "bad.static.method.in.unbound.lookup";
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4499
            } else {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4500
                key = "bad.instance.method.in.unbound.lookup";
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4501
            }
29774
9d438163db79 8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents: 29554
diff changeset
  4502
            return sym.kind.isResolutionError() ?
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4503
                    ((ResolveError)sym).getDiagnostic(dkind, pos, location, site, name, argtypes, typeargtypes) :
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4504
                    diags.create(dkind, log.currentSource(), pos, key, Kinds.kindName(sym), sym);
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4505
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4506
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4507
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4508
    /**
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4509
     * BadConstructorReferenceError error class indicating that a constructor reference symbol has been found,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4510
     * 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
  4511
     */
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4512
    class BadConstructorReferenceError extends InvalidSymbolError {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4513
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4514
        public BadConstructorReferenceError(Symbol sym) {
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4515
            super(MISSING_ENCL, sym, "BadConstructorReferenceError");
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4516
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4517
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4518
        @Override
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4519
        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
  4520
           return diags.create(dkind, log.currentSource(), pos,
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4521
                "cant.access.inner.cls.constr", site.tsym.name, argtypes, site.getEnclosingType());
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4522
        }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4523
    }
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4524
50374
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4525
    class BadClassFileError extends InvalidSymbolError {
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4526
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4527
        private final CompletionFailure ex;
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4528
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4529
        public BadClassFileError(CompletionFailure ex) {
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4530
            super(HIDDEN, ex.sym, "BadClassFileError");
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4531
            this.name = sym.name;
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4532
            this.ex = ex;
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4533
        }
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4534
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4535
        @Override
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4536
        JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4537
            JCDiagnostic d = diags.create(dkind, log.currentSource(), pos,
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4538
                "cant.access", ex.sym, ex.getDetailValue());
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4539
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4540
            d.setFlag(DiagnosticFlag.NON_DEFERRABLE);
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4541
            return d;
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4542
        }
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4543
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4544
    }
2d0647b9ac18 8198378: javac crash when checking imports and a broken class is present
jlahoda
parents: 50287
diff changeset
  4545
28456
b87fdde1404d 8068995: Cleanup method reference lookup code
mcimadamore
parents: 28336
diff changeset
  4546
    /**
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4547
     * Helper class for method resolution diagnostic simplification.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4548
     * 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
  4549
     * 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
  4550
     * 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
  4551
     * 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
  4552
     * 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
  4553
     * 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
  4554
     * 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
  4555
     * the diagnostic to a simpler one.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4556
     */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4557
    static class MethodResolutionDiagHelper {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4558
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4559
        /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4560
         * 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
  4561
         * into a simpler one
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4562
         */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4563
        interface DiagnosticRewriter {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4564
            JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4565
                    DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4566
                    DiagnosticType preferredKind, JCDiagnostic d);
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4567
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4568
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4569
        /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4570
         * 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
  4571
         * 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
  4572
         * for matching diagnostic arguments.
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4573
         */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4574
        static class Template {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4575
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4576
            /** regex used to match diag key */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4577
            String regex;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4578
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4579
            /** templates used to match diagnostic args */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4580
            Template[] subTemplates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4581
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4582
            Template(String key, Template... subTemplates) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4583
                this.regex = key;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4584
                this.subTemplates = subTemplates;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4585
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4586
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4587
            /**
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4588
             * 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
  4589
             * 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
  4590
             */
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4591
            boolean matches(Object o) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4592
                JCDiagnostic d = (JCDiagnostic)o;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4593
                Object[] args = d.getArgs();
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4594
                if (!d.getCode().matches(regex) ||
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4595
                        subTemplates.length != d.getArgs().length) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4596
                    return false;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4597
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4598
                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
  4599
                    if (!subTemplates[i].matches(args[i])) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4600
                        return false;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4601
                    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4602
                }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4603
                return true;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4604
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4605
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4606
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4607
        /**
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4608
         * Common rewriter for all argument mismatch simplifications.
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4609
         */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4610
        static class ArgMismatchRewriter implements DiagnosticRewriter {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4611
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4612
            /** the index of the subdiagnostic to be used as primary. */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4613
            int causeIndex;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4614
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4615
            public ArgMismatchRewriter(int causeIndex) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4616
                this.causeIndex = causeIndex;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4617
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4618
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4619
            @Override
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4620
            public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4621
                    DiagnosticPosition preferedPos, DiagnosticSource preferredSource,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4622
                    DiagnosticType preferredKind, JCDiagnostic d) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4623
                JCDiagnostic cause = (JCDiagnostic)d.getArgs()[causeIndex];
34854
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  4624
                DiagnosticPosition pos = d.getDiagnosticPosition();
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  4625
                if (pos == null) {
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  4626
                    pos = preferedPos;
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  4627
                }
d90aa0a83be4 8145466: javac: No line numbers in compilation error
sadayapalam
parents: 34566
diff changeset
  4628
                return diags.create(preferredKind, preferredSource, pos,
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4629
                        "prob.found.req", cause);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4630
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4631
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4632
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4633
        /** 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
  4634
        static final Template skip = new Template("") {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4635
            @Override
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4636
            boolean matches(Object d) {
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4637
                return true;
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4638
            }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4639
        };
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4640
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4641
        /** template for matching inference-free arguments mismatch failures */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4642
        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
  4643
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4644
        /** template for matching inference related arguments mismatch failures */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4645
        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
  4646
            @Override
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4647
            boolean matches(Object o) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4648
                if (!super.matches(o)) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4649
                    return false;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4650
                }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4651
                JCDiagnostic d = (JCDiagnostic)o;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4652
                @SuppressWarnings("unchecked")
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4653
                List<Type> tvars = (List<Type>)d.getArgs()[0];
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4654
                return !containsAny(d, tvars);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4655
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4656
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4657
            BiPredicate<Object, List<Type>> containsPredicate = (o, ts) -> {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4658
                if (o instanceof Type) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4659
                    return ((Type)o).containsAny(ts);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4660
                } else if (o instanceof JCDiagnostic) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4661
                    return containsAny((JCDiagnostic)o, ts);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4662
                } else {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4663
                    return false;
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4664
                }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4665
            };
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4666
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4667
            boolean containsAny(JCDiagnostic d, List<Type> ts) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4668
                return Stream.of(d.getArgs())
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4669
                        .anyMatch(o -> containsPredicate.test(o, ts));
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4670
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4671
        };
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4672
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4673
        /** rewriter map used for method resolution simplification */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22161
diff changeset
  4674
        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
  4675
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4676
        static {
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4677
            rewriters.put(argMismatchTemplate, new ArgMismatchRewriter(0));
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4678
            rewriters.put(inferArgMismatchTemplate, new ArgMismatchRewriter(1));
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4679
        }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4680
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4681
        /**
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4682
         * 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
  4683
         * and rewrite it accordingly.
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4684
         */
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4685
        static JCDiagnostic rewrite(JCDiagnostic.Factory diags, DiagnosticPosition pos, DiagnosticSource source,
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4686
                                    DiagnosticType dkind, JCDiagnostic d) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4687
            for (Map.Entry<Template, DiagnosticRewriter> _entry : rewriters.entrySet()) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4688
                if (_entry.getKey().matches(d)) {
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4689
                    JCDiagnostic simpleDiag =
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4690
                            _entry.getValue().rewriteDiagnostic(diags, pos, source, dkind, d);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4691
                    simpleDiag.setFlag(DiagnosticFlag.COMPRESSED);
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4692
                    return simpleDiag;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4693
                }
28331
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4694
            }
43ed6b2e0e3b 8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents: 27849
diff changeset
  4695
            return null;
17582
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4696
        }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4697
    }
4079713129dd 8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents: 16975
diff changeset
  4698
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4699
    enum MethodResolutionPhase {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4700
        BASIC(false, false),
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4701
        BOX(true, false),
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4702
        VARARITY(true, true) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4703
            @Override
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4704
            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
  4705
                //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
  4706
                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
  4707
                if (!sym.kind.isResolutionError()) {
26533
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4708
                    //varargs resolution successful
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4709
                    return sym;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4710
                } else {
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4711
                    //pick best error
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4712
                    switch (bestSoFar.kind) {
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4713
                        case WRONG_MTH:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4714
                        case WRONG_MTHS:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4715
                            //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
  4716
                            //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
  4717
                            //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
  4718
                            //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
  4719
                            switch (sym.kind) {
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4720
                                case WRONG_MTH:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4721
                                    //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
  4722
                                    //result instead
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4723
                                    return bestSoFar.kind == WRONG_MTHS ?
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4724
                                            bestSoFar : sym;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4725
                                case ABSENT_MTH:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4726
                                    //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
  4727
                                    //match any method
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4728
                                    return bestSoFar;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4729
                                case WRONG_MTHS:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4730
                                default:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4731
                                    //safe to override
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4732
                                    return sym;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4733
                            }
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4734
                        default:
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4735
                            //otherwise, return first error
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4736
                            return bestSoFar;
8fba085fbdbf 8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents: 26266
diff changeset
  4737
                    }
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4738
                }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4739
            }
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4740
        };
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4741
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
  4742
        final boolean isBoxingRequired;
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14724
diff changeset
  4743
        final boolean isVarargsRequired;
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4744
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4745
        MethodResolutionPhase(boolean isBoxingRequired, boolean isVarargsRequired) {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4746
           this.isBoxingRequired = isBoxingRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4747
           this.isVarargsRequired = isVarargsRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4748
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4749
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4750
        public boolean isBoxingRequired() {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4751
            return isBoxingRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4752
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4753
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4754
        public boolean isVarargsRequired() {
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4755
            return isVarargsRequired;
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4756
        }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4757
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4758
        public Symbol mergeResults(Symbol prev, Symbol sym) {
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4759
            return sym;
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
  4760
        }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4761
    }
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4762
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4763
    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
  4764
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4765
    /**
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4766
     * 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
  4767
     * overload resolution, such as list of method that are not applicable
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4768
     * (used to generate more precise diagnostics) and so on. Resolution contexts
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4769
     * 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
  4770
     * work within the resolution context it created.
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4771
     */
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4772
    class MethodResolutionContext {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4773
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4774
        private List<Candidate> candidates = List.nil();
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4775
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4776
        MethodResolutionPhase step = null;
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4777
16805
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  4778
        MethodCheck methodCheck = resolveMethodCheck;
b419336382fd 8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents: 16323
diff changeset
  4779
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4780
        private boolean internalResolution = false;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4781
        private DeferredAttr.AttrMode attrMode = DeferredAttr.AttrMode.SPECULATIVE;
6710
b14e6fe7b290 5088624: cannot find symbol message should be more intelligent
mcimadamore
parents: 6592
diff changeset
  4782
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4783
        void addInapplicableCandidate(Symbol sym, JCDiagnostic details) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4784
            Candidate c = new Candidate(currentResolutionContext.step, sym, details, null);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  4785
            candidates = candidates.append(c);
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4786
        }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4787
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4788
        void addApplicableCandidate(Symbol sym, Type mtype) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4789
            Candidate c = new Candidate(currentResolutionContext.step, sym, null, mtype);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4790
            candidates = candidates.append(c);
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4791
        }
10816
ce8a7e9d8882 7098660: Write better overload resolution/inference tests
mcimadamore
parents: 10812
diff changeset
  4792
15706
37a81a6987ac 8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents: 15705
diff changeset
  4793
        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
  4794
            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
  4795
                ? deferredAttr.emptyDeferredAttrContext
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
  4796
                : pendingResult.checkContext.deferredAttrContext();
00a059740d87 8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents: 23105
diff changeset
  4797
            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
  4798
                    inferenceContext, parent, warn);
15037
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  4799
        }
8ba16ac61b1a 8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents: 14957
diff changeset
  4800
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4801
        /**
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4802
         * This class represents an overload resolution candidate. There are two
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4803
         * kinds of candidates: applicable methods and inapplicable methods;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4804
         * applicable methods have a pointer to the instantiated method type,
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4805
         * while inapplicable candidates contain further details about the
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4806
         * reason why the method has been considered inapplicable.
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4807
         */
16301
b6fd735ea78e 6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents: 16294
diff changeset
  4808
        @SuppressWarnings("overrides")
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4809
        class Candidate {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4810
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4811
            final MethodResolutionPhase step;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4812
            final Symbol sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4813
            final JCDiagnostic details;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4814
            final Type mtype;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4815
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4816
            private Candidate(MethodResolutionPhase step, Symbol sym, JCDiagnostic details, Type mtype) {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4817
                this.step = step;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4818
                this.sym = sym;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4819
                this.details = details;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4820
                this.mtype = mtype;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4821
            }
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4822
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4823
            boolean isApplicable() {
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4824
                return mtype != null;
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4825
            }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4826
        }
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4827
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4828
        DeferredAttr.AttrMode attrMode() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4829
            return attrMode;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4830
        }
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4831
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4832
        boolean internal() {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4833
            return internalResolution;
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14056
diff changeset
  4834
        }
1533
6a9a2f681d24 6746184: javac fails to compile call to public varargs method
mcimadamore
parents: 1529
diff changeset
  4835
    }
12076
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4836
1b7560bd1760 7132880: Resolve should support nested resolution contexts
mcimadamore
parents: 11707
diff changeset
  4837
    MethodResolutionContext currentResolutionContext = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4838
}