author | vromero |
Mon, 27 Nov 2017 13:26:31 -0500 | |
changeset 47942 | 06652ffab955 |
parent 47298 | 2e947e1bd907 |
child 48054 | 702043a4cdeb |
permissions | -rw-r--r-- |
10 | 1 |
/* |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2 |
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. |
10 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5520 | 7 |
* published by the Free Software Foundation. Oracle designates this |
10 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5520 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
10 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5520 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
10 | 24 |
*/ |
25 |
||
26 |
package com.sun.tools.javac.comp; |
|
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 | 29 |
import com.sun.tools.javac.code.*; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
30 |
import com.sun.tools.javac.code.Scope.WriteableScope; |
14052 | 31 |
import com.sun.tools.javac.code.Symbol.*; |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
32 |
import com.sun.tools.javac.code.Type.*; |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
33 |
import com.sun.tools.javac.comp.Attr.ResultInfo; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
34 |
import com.sun.tools.javac.comp.Check.CheckContext; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
35 |
import com.sun.tools.javac.comp.DeferredAttr.AttrMode; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
36 |
import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
37 |
import com.sun.tools.javac.comp.DeferredAttr.DeferredType; |
15705 | 38 |
import com.sun.tools.javac.comp.Infer.FreeTypeListener; |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
39 |
import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate; |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
40 |
import com.sun.tools.javac.comp.Resolve.MethodResolutionDiagHelper.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 | 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 | 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 | 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 | 60 |
import java.util.Iterator; |
14444 | 61 |
import java.util.LinkedHashMap; |
47298
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
62 |
import java.util.LinkedList; |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
63 |
import java.util.Map; |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
64 |
import java.util.Set; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
65 |
import java.util.function.BiFunction; |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
66 |
import java.util.function.BiPredicate; |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
67 |
import java.util.function.Function; |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
68 |
import java.util.function.Predicate; |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
69 |
import java.util.stream.Stream; |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
70 |
|
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
71 |
import javax.lang.model.element.ElementVisitor; |
10 | 72 |
|
73 |
import static com.sun.tools.javac.code.Flags.*; |
|
10950 | 74 |
import static com.sun.tools.javac.code.Flags.BLOCK; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
75 |
import static com.sun.tools.javac.code.Flags.STATIC; |
10 | 76 |
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
|
77 |
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
|
78 |
import static com.sun.tools.javac.code.TypeTag.*; |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
79 |
import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*; |
10950 | 80 |
import static com.sun.tools.javac.tree.JCTree.Tag.*; |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
81 |
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
|
82 |
|
10 | 83 |
/** Helper class for name resolution, used mostly by the attribution phase. |
84 |
* |
|
5847
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5846
diff
changeset
|
85 |
* <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
|
86 |
* If you write code that depends on this, you do so at your own risk. |
10 | 87 |
* This code and its internal interfaces are subject to change or |
88 |
* deletion without notice.</b> |
|
89 |
*/ |
|
90 |
public class Resolve { |
|
22163 | 91 |
protected static final Context.Key<Resolve> resolveKey = new Context.Key<>(); |
10 | 92 |
|
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
93 |
Names names; |
10 | 94 |
Log log; |
95 |
Symtab syms; |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
96 |
Attr attr; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
97 |
DeferredAttr deferredAttr; |
10 | 98 |
Check chk; |
99 |
Infer infer; |
|
24604
7f68545b5128
8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
24404
diff
changeset
|
100 |
ClassFinder finder; |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
101 |
ModuleFinder moduleFinder; |
10 | 102 |
Types types; |
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
103 |
JCDiagnostic.Factory diags; |
6592
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
104 |
public final boolean allowMethodHandles; |
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
105 |
public final boolean allowFunctionalInterfaceMostSpecific; |
36526 | 106 |
public final boolean allowModules; |
25435
928866794984
8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents:
25279
diff
changeset
|
107 |
public final boolean checkVarargsAccessAfterResolution; |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
108 |
private final boolean compactMethodDiags; |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
109 |
private final boolean allowLocalVariableTypeInference; |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
110 |
final EnumSet<VerboseResolutionMode> verboseResolutionMode; |
10 | 111 |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
112 |
WriteableScope polymorphicSignatureScope; |
6592
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
113 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
114 |
protected Resolve(Context context) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
115 |
context.put(resolveKey, this); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
116 |
syms = Symtab.instance(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
117 |
|
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
118 |
varNotFound = new SymbolNotFoundError(ABSENT_VAR); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
119 |
methodNotFound = new SymbolNotFoundError(ABSENT_MTH); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
120 |
typeNotFound = new SymbolNotFoundError(ABSENT_TYP); |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
121 |
referenceNotFound = ReferenceLookupResult.error(methodNotFound); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
122 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
123 |
names = Names.instance(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
124 |
log = Log.instance(context); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
125 |
attr = Attr.instance(context); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
126 |
deferredAttr = DeferredAttr.instance(context); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
127 |
chk = Check.instance(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
128 |
infer = Infer.instance(context); |
24604
7f68545b5128
8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
24404
diff
changeset
|
129 |
finder = ClassFinder.instance(context); |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
130 |
moduleFinder = ModuleFinder.instance(context); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
131 |
types = Types.instance(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
132 |
diags = JCDiagnostic.Factory.instance(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
133 |
Source source = Source.instance(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
134 |
Options options = Options.instance(context); |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
135 |
compactMethodDiags = options.isSet(Option.XDIAGS, "compact") || |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
136 |
options.isUnset(Option.XDIAGS) && options.isUnset("rawDiagnostics"); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
137 |
verboseResolutionMode = VerboseResolutionMode.getVerboseResolutionMode(options); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
138 |
Target target = Target.instance(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
139 |
allowMethodHandles = target.hasMethodHandles(); |
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
140 |
allowFunctionalInterfaceMostSpecific = source.allowFunctionalInterfaceMostSpecific(); |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
141 |
allowLocalVariableTypeInference = source.allowLocalVariableTypeInference(); |
25435
928866794984
8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents:
25279
diff
changeset
|
142 |
checkVarargsAccessAfterResolution = |
25008
969bfaae5bce
8036953: Fix timing of varargs access check, per JDK-8016205
vromero
parents:
24612
diff
changeset
|
143 |
source.allowPostApplicabilityVarargsAccessCheck(); |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
144 |
polymorphicSignatureScope = WriteableScope.create(syms.noSymbol); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
145 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
146 |
inapplicableMethodException = new InapplicableMethodException(diags); |
36526 | 147 |
|
148 |
allowModules = source.allowModules(); |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
149 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
150 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
151 |
/** error symbols, which are returned when resolution fails |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
152 |
*/ |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
153 |
private final SymbolNotFoundError varNotFound; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
154 |
private final SymbolNotFoundError methodNotFound; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
155 |
private final SymbolNotFoundError typeNotFound; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
156 |
|
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
157 |
/** empty reference lookup result */ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
158 |
private final ReferenceLookupResult referenceNotFound; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
159 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
160 |
public static Resolve instance(Context context) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
161 |
Resolve instance = context.get(resolveKey); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
162 |
if (instance == null) |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
163 |
instance = new Resolve(context); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
164 |
return instance; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
165 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
166 |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
167 |
private static Symbol bestOf(Symbol s1, |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
168 |
Symbol s2) { |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
169 |
return s1.kind.betterThan(s2.kind) ? s1 : s2; |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
170 |
} |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
171 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
172 |
// <editor-fold defaultstate="collapsed" desc="Verbose resolution diagnostics support"> |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
173 |
enum VerboseResolutionMode { |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
174 |
SUCCESS("success"), |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
175 |
FAILURE("failure"), |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
176 |
APPLICABLE("applicable"), |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
177 |
INAPPLICABLE("inapplicable"), |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
178 |
DEFERRED_INST("deferred-inference"), |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
179 |
PREDEF("predef"), |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
180 |
OBJECT_INIT("object-init"), |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
181 |
INTERNAL("internal"); |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
182 |
|
14801
d66cab4ef397
8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents:
14724
diff
changeset
|
183 |
final String opt; |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
184 |
|
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
185 |
private VerboseResolutionMode(String opt) { |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
186 |
this.opt = opt; |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
187 |
} |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
188 |
|
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
189 |
static EnumSet<VerboseResolutionMode> getVerboseResolutionMode(Options opts) { |
39599 | 190 |
String s = opts.get("debug.verboseResolution"); |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
191 |
EnumSet<VerboseResolutionMode> res = EnumSet.noneOf(VerboseResolutionMode.class); |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
192 |
if (s == null) return res; |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
193 |
if (s.contains("all")) { |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
194 |
res = EnumSet.allOf(VerboseResolutionMode.class); |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
195 |
} |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
196 |
Collection<String> args = Arrays.asList(s.split(",")); |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
197 |
for (VerboseResolutionMode mode : values()) { |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
198 |
if (args.contains(mode.opt)) { |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
199 |
res.add(mode); |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
200 |
} else if (args.contains("-" + mode.opt)) { |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
201 |
res.remove(mode); |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
202 |
} |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
203 |
} |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
204 |
return res; |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
205 |
} |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
206 |
} |
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
207 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
208 |
void reportVerboseResolutionDiagnostic(DiagnosticPosition dpos, Name name, Type site, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
209 |
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
|
210 |
boolean success = !bestSoFar.kind.isResolutionError(); |
12076
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 (success && !verboseResolutionMode.contains(VerboseResolutionMode.SUCCESS)) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
213 |
return; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
214 |
} else if (!success && !verboseResolutionMode.contains(VerboseResolutionMode.FAILURE)) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
215 |
return; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
216 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
217 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
218 |
if (bestSoFar.name == names.init && |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
219 |
bestSoFar.owner == syms.objectType.tsym && |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
220 |
!verboseResolutionMode.contains(VerboseResolutionMode.OBJECT_INIT)) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
221 |
return; //skip diags for Object constructor resolution |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
222 |
} else if (site == syms.predefClass.type && |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
223 |
!verboseResolutionMode.contains(VerboseResolutionMode.PREDEF)) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
224 |
return; //skip spurious diags for predef symbols (i.e. operators) |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
225 |
} else if (currentResolutionContext.internalResolution && |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
226 |
!verboseResolutionMode.contains(VerboseResolutionMode.INTERNAL)) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
227 |
return; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
228 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
229 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
230 |
int pos = 0; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
231 |
int mostSpecificPos = -1; |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19940
diff
changeset
|
232 |
ListBuffer<JCDiagnostic> subDiags = new ListBuffer<>(); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
233 |
for (Candidate c : currentResolutionContext.candidates) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
234 |
if (currentResolutionContext.step != c.step || |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
235 |
(c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.APPLICABLE)) || |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
236 |
(!c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.INAPPLICABLE))) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
237 |
continue; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
238 |
} else { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
239 |
subDiags.append(c.isApplicable() ? |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
240 |
getVerboseApplicableCandidateDiag(pos, c.sym, c.mtype) : |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
241 |
getVerboseInapplicableCandidateDiag(pos, c.sym, c.details)); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
242 |
if (c.sym == bestSoFar) |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
243 |
mostSpecificPos = pos; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
244 |
pos++; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
245 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
246 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
247 |
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
|
248 |
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
|
249 |
JCDiagnostic main = diags.note(log.currentSource(), dpos, key, name, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
250 |
site.tsym, mostSpecificPos, currentResolutionContext.step, |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
251 |
methodArguments(argtypes2), |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
252 |
methodArguments(typeargtypes)); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
253 |
JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, subDiags.toList()); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
254 |
log.report(d); |
10 | 255 |
} |
256 |
||
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
257 |
JCDiagnostic getVerboseApplicableCandidateDiag(int pos, Symbol sym, Type inst) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
258 |
JCDiagnostic subDiag = null; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
259 |
if (sym.type.hasTag(FORALL)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
260 |
subDiag = diags.fragment(Fragments.PartialInstSig(inst)); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
261 |
} |
10 | 262 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
263 |
String key = subDiag == null ? |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
264 |
"applicable.method.found" : |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
265 |
"applicable.method.found.1"; |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
266 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
267 |
return diags.fragment(key, pos, sym, subDiag); |
10 | 268 |
} |
269 |
||
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
270 |
JCDiagnostic getVerboseInapplicableCandidateDiag(int pos, Symbol sym, JCDiagnostic subDiag) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
271 |
return diags.fragment(Fragments.NotApplicableMethodFound(pos, sym, subDiag)); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
272 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
273 |
// </editor-fold> |
10 | 274 |
|
275 |
/* ************************************************************************ |
|
276 |
* Identifier resolution |
|
277 |
*************************************************************************/ |
|
278 |
||
279 |
/** An environment is "static" if its static level is greater than |
|
280 |
* the one of its outer environment |
|
281 |
*/ |
|
14056 | 282 |
protected static boolean isStatic(Env<AttrContext> env) { |
22440
d40c30326317
8028389: NullPointerException compiling annotation values that have bodies
alundblad
parents:
22167
diff
changeset
|
283 |
return env.outer != null && env.info.staticLevel > env.outer.info.staticLevel; |
10 | 284 |
} |
285 |
||
286 |
/** An environment is an "initializer" if it is a constructor or |
|
287 |
* an instance initializer. |
|
288 |
*/ |
|
289 |
static boolean isInitializer(Env<AttrContext> env) { |
|
290 |
Symbol owner = env.info.scope.owner; |
|
291 |
return owner.isConstructor() || |
|
292 |
owner.owner.kind == TYP && |
|
293 |
(owner.kind == VAR || |
|
294 |
owner.kind == MTH && (owner.flags() & BLOCK) != 0) && |
|
295 |
(owner.flags() & STATIC) == 0; |
|
296 |
} |
|
297 |
||
298 |
/** Is class accessible in given evironment? |
|
299 |
* @param env The current environment. |
|
300 |
* @param c The class whose accessibility is checked. |
|
301 |
*/ |
|
302 |
public boolean isAccessible(Env<AttrContext> env, TypeSymbol c) { |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
303 |
return isAccessible(env, c, false); |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
304 |
} |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
305 |
|
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
306 |
public boolean isAccessible(Env<AttrContext> env, TypeSymbol c, boolean checkInner) { |
32951
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
307 |
|
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
308 |
/* 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
|
309 |
to refer to an inaccessible type |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
310 |
*/ |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
311 |
if (env.enclMethod != null && (env.enclMethod.mods.flags & ANONCONSTR) != 0) |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
312 |
return true; |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
313 |
|
43865
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
314 |
if (env.info.visitingServiceImplementation && |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
315 |
env.toplevel.modle == c.packge().modle) { |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
316 |
return true; |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
317 |
} |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
318 |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
319 |
boolean isAccessible = false; |
10 | 320 |
switch ((short)(c.flags() & AccessFlags)) { |
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
321 |
case PRIVATE: |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
322 |
isAccessible = |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
323 |
env.enclClass.sym.outermostClass() == |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
324 |
c.owner.outermostClass(); |
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 |
case 0: |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
327 |
isAccessible = |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
328 |
env.toplevel.packge == c.owner // fast special case |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
329 |
|| |
32951
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
330 |
env.toplevel.packge == c.packge(); |
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
331 |
break; |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
332 |
default: // error recovery |
36526 | 333 |
isAccessible = true; |
334 |
break; |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
335 |
case PUBLIC: |
43131 | 336 |
if (allowModules) { |
36526 | 337 |
ModuleSymbol currModule = env.toplevel.modle; |
338 |
currModule.complete(); |
|
339 |
PackageSymbol p = c.packge(); |
|
340 |
isAccessible = |
|
44451
1619c00af9df
8177311: Denied access when named module accesses unreferences package from the unnamed module
jlahoda
parents:
43866
diff
changeset
|
341 |
currModule == p.modle || |
1619c00af9df
8177311: Denied access when named module accesses unreferences package from the unnamed module
jlahoda
parents:
43866
diff
changeset
|
342 |
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
|
343 |
p == syms.rootPackage || |
1619c00af9df
8177311: Denied access when named module accesses unreferences package from the unnamed module
jlahoda
parents:
43866
diff
changeset
|
344 |
(p.modle == syms.unnamedModule && currModule.readModules.contains(p.modle)); |
36526 | 345 |
} else { |
346 |
isAccessible = true; |
|
347 |
} |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
348 |
break; |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
349 |
case PROTECTED: |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
350 |
isAccessible = |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
351 |
env.toplevel.packge == c.owner // fast special case |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
352 |
|| |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
353 |
env.toplevel.packge == c.packge() |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
354 |
|| |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
355 |
isInnerSubClass(env.enclClass.sym, c.owner); |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
356 |
break; |
10 | 357 |
} |
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
358 |
return (checkInner == false || c.type.getEnclosingType() == Type.noType) ? |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
359 |
isAccessible : |
7637 | 360 |
isAccessible && isAccessible(env, c.type.getEnclosingType(), checkInner); |
10 | 361 |
} |
362 |
//where |
|
363 |
/** Is given class a subclass of given base class, or an inner class |
|
364 |
* of a subclass? |
|
365 |
* Return null if no such class exists. |
|
366 |
* @param c The class which is the subclass or is contained in it. |
|
367 |
* @param base The base class |
|
368 |
*/ |
|
369 |
private boolean isInnerSubClass(ClassSymbol c, Symbol base) { |
|
370 |
while (c != null && !c.isSubClass(base, types)) { |
|
371 |
c = c.owner.enclClass(); |
|
372 |
} |
|
373 |
return c != null; |
|
374 |
} |
|
375 |
||
376 |
boolean isAccessible(Env<AttrContext> env, Type t) { |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
377 |
return isAccessible(env, t, false); |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
378 |
} |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
379 |
|
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
380 |
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
|
381 |
return (t.hasTag(ARRAY)) |
24612
75dc732b45af
8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents:
24604
diff
changeset
|
382 |
? isAccessible(env, types.cvarUpperBound(types.elemtype(t))) |
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
383 |
: isAccessible(env, t.tsym, checkInner); |
10 | 384 |
} |
385 |
||
17998
02a5abb2ae2f
7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents:
17804
diff
changeset
|
386 |
/** Is symbol accessible as a member of given type in given environment? |
10 | 387 |
* @param env The current environment. |
388 |
* @param site The type of which the tested symbol is regarded |
|
389 |
* as a member. |
|
390 |
* @param sym The symbol. |
|
391 |
*/ |
|
392 |
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
|
393 |
return isAccessible(env, site, sym, false); |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
394 |
} |
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
395 |
public boolean isAccessible(Env<AttrContext> env, Type site, Symbol sym, boolean checkInner) { |
10 | 396 |
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
|
397 |
|
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
398 |
/* 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
|
399 |
to refer to an inaccessible type |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
400 |
*/ |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
401 |
if (env.enclMethod != null && (env.enclMethod.mods.flags & ANONCONSTR) != 0) |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
402 |
return true; |
a098b538296c
8075799: Extraneous access checks implemented by javac
sadayapalam
parents:
32949
diff
changeset
|
403 |
|
43865
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
404 |
if (env.info.visitingServiceImplementation && |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
405 |
env.toplevel.modle == sym.packge().modle) { |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
406 |
return true; |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
407 |
} |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43272
diff
changeset
|
408 |
|
10 | 409 |
switch ((short)(sym.flags() & AccessFlags)) { |
410 |
case PRIVATE: |
|
411 |
return |
|
412 |
(env.enclClass.sym == sym.owner // fast special case |
|
413 |
|| |
|
414 |
env.enclClass.sym.outermostClass() == |
|
415 |
sym.owner.outermostClass()) |
|
416 |
&& |
|
417 |
sym.isInheritedIn(site.tsym, types); |
|
418 |
case 0: |
|
419 |
return |
|
420 |
(env.toplevel.packge == sym.owner.owner // fast special case |
|
421 |
|| |
|
422 |
env.toplevel.packge == sym.packge()) |
|
423 |
&& |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
424 |
isAccessible(env, site, checkInner) |
10 | 425 |
&& |
2511 | 426 |
sym.isInheritedIn(site.tsym, types) |
427 |
&& |
|
428 |
notOverriddenIn(site, sym); |
|
10 | 429 |
case PROTECTED: |
430 |
return |
|
431 |
(env.toplevel.packge == sym.owner.owner // fast special case |
|
432 |
|| |
|
433 |
env.toplevel.packge == sym.packge() |
|
434 |
|| |
|
435 |
isProtectedAccessible(sym, env.enclClass.sym, site) |
|
436 |
|| |
|
437 |
// OK to select instance method or field from 'super' or type name |
|
438 |
// (but type names should be disallowed elsewhere!) |
|
439 |
env.info.selectSuper && (sym.flags() & STATIC) == 0 && sym.kind != TYP) |
|
440 |
&& |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
441 |
isAccessible(env, site, checkInner) |
10 | 442 |
&& |
2511 | 443 |
notOverriddenIn(site, sym); |
10 | 444 |
default: // this case includes erroneous combinations as well |
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
6721
diff
changeset
|
445 |
return isAccessible(env, site, checkInner) && notOverriddenIn(site, sym); |
2511 | 446 |
} |
447 |
} |
|
448 |
//where |
|
449 |
/* `sym' is accessible only if not overridden by |
|
450 |
* another symbol which is a member of `site' |
|
451 |
* (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
|
452 |
* 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
|
453 |
* cannot be overridden (e.g. MH.invokeExact(Object[])). |
2511 | 454 |
*/ |
455 |
private boolean notOverriddenIn(Type site, Symbol sym) { |
|
456 |
if (sym.kind != MTH || sym.isConstructor() || sym.isStatic()) |
|
457 |
return true; |
|
458 |
else { |
|
459 |
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
|
460 |
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
|
461 |
!types.isSubSignature(types.memberType(site, s2), types.memberType(site, sym))); |
10 | 462 |
} |
463 |
} |
|
464 |
//where |
|
465 |
/** Is given protected symbol accessible if it is selected from given site |
|
466 |
* and the selection takes place in given class? |
|
467 |
* @param sym The symbol with protected access |
|
468 |
* @param c The class where the access takes place |
|
469 |
* @site The type of the qualifier |
|
470 |
*/ |
|
471 |
private |
|
472 |
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
|
473 |
Type newSite = site.hasTag(TYPEVAR) ? site.getUpperBound() : site; |
10 | 474 |
while (c != null && |
475 |
!(c.isSubClass(sym.owner, types) && |
|
476 |
(c.flags() & INTERFACE) == 0 && |
|
477 |
// In JLS 2e 6.6.2.1, the subclass restriction applies |
|
478 |
// only to instance fields and methods -- types are excluded |
|
479 |
// 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
|
480 |
((sym.flags() & STATIC) != 0 || sym.kind == TYP || newSite.tsym.isSubClass(c, types)))) |
10 | 481 |
c = c.owner.enclClass(); |
482 |
return c != null; |
|
483 |
} |
|
484 |
||
14547 | 485 |
/** |
486 |
* Performs a recursive scan of a type looking for accessibility problems |
|
487 |
* from current attribution environment |
|
488 |
*/ |
|
489 |
void checkAccessibleType(Env<AttrContext> env, Type t) { |
|
490 |
accessibilityChecker.visit(t, env); |
|
491 |
} |
|
492 |
||
493 |
/** |
|
494 |
* Accessibility type-visitor |
|
495 |
*/ |
|
496 |
Types.SimpleVisitor<Void, Env<AttrContext>> accessibilityChecker = |
|
497 |
new Types.SimpleVisitor<Void, Env<AttrContext>>() { |
|
498 |
||
499 |
void visit(List<Type> ts, Env<AttrContext> env) { |
|
500 |
for (Type t : ts) { |
|
501 |
visit(t, env); |
|
502 |
} |
|
503 |
} |
|
504 |
||
505 |
public Void visitType(Type t, Env<AttrContext> env) { |
|
506 |
return null; |
|
507 |
} |
|
508 |
||
509 |
@Override |
|
510 |
public Void visitArrayType(ArrayType t, Env<AttrContext> env) { |
|
511 |
visit(t.elemtype, env); |
|
512 |
return null; |
|
513 |
} |
|
514 |
||
515 |
@Override |
|
516 |
public Void visitClassType(ClassType t, Env<AttrContext> env) { |
|
517 |
visit(t.getTypeArguments(), env); |
|
518 |
if (!isAccessible(env, t, true)) { |
|
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
519 |
accessBase(new AccessError(env, null, t.tsym), env.tree.pos(), env.enclClass.sym, t, t.tsym.name, true); |
14547 | 520 |
} |
521 |
return null; |
|
522 |
} |
|
523 |
||
524 |
@Override |
|
525 |
public Void visitWildcardType(WildcardType t, Env<AttrContext> env) { |
|
526 |
visit(t.type, env); |
|
527 |
return null; |
|
528 |
} |
|
529 |
||
530 |
@Override |
|
531 |
public Void visitMethodType(MethodType t, Env<AttrContext> env) { |
|
532 |
visit(t.getParameterTypes(), env); |
|
533 |
visit(t.getReturnType(), env); |
|
534 |
visit(t.getThrownTypes(), env); |
|
535 |
return null; |
|
536 |
} |
|
537 |
}; |
|
538 |
||
10 | 539 |
/** 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
|
540 |
* given type arguments and argument types. If successful, return |
10 | 541 |
* the method's instantiated type, else return null. |
542 |
* The instantiation will take into account an additional leading |
|
543 |
* 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
|
544 |
* of an under determined site. In this case, we treat site as an additional |
10 | 545 |
* parameter and the parameters of the class containing the method as |
546 |
* additional type variables that get instantiated. |
|
547 |
* |
|
548 |
* @param env The current environment |
|
549 |
* @param site The type of which the method is a member. |
|
550 |
* @param m The method symbol. |
|
551 |
* @param argtypes The invocation's given value arguments. |
|
552 |
* @param typeargtypes The invocation's given type arguments. |
|
553 |
* @param allowBoxing Allow boxing conversions of arguments. |
|
554 |
* @param useVarargs Box trailing arguments into an array for varargs. |
|
555 |
*/ |
|
556 |
Type rawInstantiate(Env<AttrContext> env, |
|
557 |
Type site, |
|
558 |
Symbol m, |
|
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
559 |
ResultInfo resultInfo, |
10 | 560 |
List<Type> argtypes, |
561 |
List<Type> typeargtypes, |
|
562 |
boolean allowBoxing, |
|
563 |
boolean useVarargs, |
|
14444 | 564 |
Warner warn) throws Infer.InferenceException { |
10 | 565 |
Type mt = types.memberType(site, m); |
566 |
// tvars is the list of formal type variables for which type arguments |
|
567 |
// need to inferred. |
|
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
568 |
List<Type> tvars = List.nil(); |
10 | 569 |
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
|
570 |
if (!mt.hasTag(FORALL) && typeargtypes.nonEmpty()) { |
10 | 571 |
// 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
|
572 |
// 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
|
573 |
} else if (mt.hasTag(FORALL) && typeargtypes.nonEmpty()) { |
10 | 574 |
ForAll pmt = (ForAll) mt; |
575 |
if (typeargtypes.length() != pmt.tvars.length()) |
|
41943
a4ee110842fb
8169093: Generics, javac not matching actual and formal arguments.
mcimadamore
parents:
41932
diff
changeset
|
576 |
// not enough args |
a4ee110842fb
8169093: Generics, javac not matching actual and formal arguments.
mcimadamore
parents:
41932
diff
changeset
|
577 |
throw inapplicableMethodException.setMessage("wrong.number.type.args", Integer.toString(pmt.tvars.length())); |
10 | 578 |
// Check type arguments are within bounds |
579 |
List<Type> formals = pmt.tvars; |
|
580 |
List<Type> actuals = typeargtypes; |
|
581 |
while (formals.nonEmpty() && actuals.nonEmpty()) { |
|
582 |
List<Type> bounds = types.subst(types.getBounds((TypeVar)formals.head), |
|
583 |
pmt.tvars, typeargtypes); |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
584 |
for (; bounds.nonEmpty(); bounds = bounds.tail) { |
10 | 585 |
if (!types.isSubtypeUnchecked(actuals.head, bounds.head, warn)) |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
586 |
throw inapplicableMethodException.setMessage("explicit.param.do.not.conform.to.bounds",actuals.head, bounds); |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
587 |
} |
10 | 588 |
formals = formals.tail; |
589 |
actuals = actuals.tail; |
|
590 |
} |
|
591 |
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
|
592 |
} else if (mt.hasTag(FORALL)) { |
10 | 593 |
ForAll pmt = (ForAll) mt; |
594 |
List<Type> tvars1 = types.newInstances(pmt.tvars); |
|
595 |
tvars = tvars.appendList(tvars1); |
|
596 |
mt = types.subst(pmt.qtype, pmt.tvars, tvars1); |
|
597 |
} |
|
598 |
||
599 |
// 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
|
600 |
boolean instNeeded = tvars.tail != null; /*inlined: tvars.nonEmpty()*/ |
10 | 601 |
for (List<Type> l = argtypes; |
602 |
l.tail != null/*inlined: l.nonEmpty()*/ && !instNeeded; |
|
603 |
l = l.tail) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
604 |
if (l.head.hasTag(FORALL)) instNeeded = true; |
10 | 605 |
} |
606 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
607 |
if (instNeeded) { |
12335
4725d88691dd
7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents:
12334
diff
changeset
|
608 |
return infer.instantiateMethod(env, |
5489
e7af65bf7577
6730476: invalid "unchecked generic array" warning
mcimadamore
parents:
5321
diff
changeset
|
609 |
tvars, |
10 | 610 |
(MethodType)mt, |
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
611 |
resultInfo, |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
612 |
(MethodSymbol)m, |
10 | 613 |
argtypes, |
614 |
allowBoxing, |
|
615 |
useVarargs, |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
616 |
currentResolutionContext, |
10 | 617 |
warn); |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
618 |
} |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
619 |
|
19914 | 620 |
DeferredAttr.DeferredAttrContext dc = currentResolutionContext.deferredAttrContext(m, infer.emptyContext, resultInfo, warn); |
621 |
currentResolutionContext.methodCheck.argumentsAcceptable(env, dc, |
|
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
622 |
argtypes, mt.getParameterTypes(), warn); |
19914 | 623 |
dc.complete(); |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
624 |
return mt; |
10 | 625 |
} |
626 |
||
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
627 |
Type checkMethod(Env<AttrContext> env, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
628 |
Type site, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
629 |
Symbol m, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
630 |
ResultInfo resultInfo, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
631 |
List<Type> argtypes, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
632 |
List<Type> typeargtypes, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
633 |
Warner warn) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
634 |
MethodResolutionContext prevContext = currentResolutionContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
635 |
try { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
636 |
currentResolutionContext = new MethodResolutionContext(); |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
637 |
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
|
638 |
AttrMode.SPECULATIVE : DeferredAttr.AttrMode.CHECK; |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
639 |
if (env.tree.hasTag(JCTree.Tag.REFERENCE)) { |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
640 |
//method/constructor references need special check class |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
641 |
//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
|
642 |
//during an unsticking round) |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
643 |
currentResolutionContext.methodCheck = |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
644 |
new MethodReferenceCheck(resultInfo.checkContext.inferenceContext()); |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
645 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
646 |
MethodResolutionPhase step = currentResolutionContext.step = env.info.pendingResolutionPhase; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
647 |
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
|
648 |
step.isBoxingRequired(), step.isVarargsRequired(), warn); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
649 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
650 |
finally { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
651 |
currentResolutionContext = prevContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
652 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
653 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
654 |
|
10 | 655 |
/** Same but returns null instead throwing a NoInstanceException |
656 |
*/ |
|
657 |
Type instantiate(Env<AttrContext> env, |
|
658 |
Type site, |
|
659 |
Symbol m, |
|
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
660 |
ResultInfo resultInfo, |
10 | 661 |
List<Type> argtypes, |
662 |
List<Type> typeargtypes, |
|
663 |
boolean allowBoxing, |
|
664 |
boolean useVarargs, |
|
665 |
Warner warn) { |
|
666 |
try { |
|
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
667 |
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
|
668 |
allowBoxing, useVarargs, warn); |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
669 |
} catch (InapplicableMethodException ex) { |
10 | 670 |
return null; |
671 |
} |
|
672 |
} |
|
673 |
||
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
674 |
/** |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
675 |
* 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
|
676 |
* 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
|
677 |
* 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
|
678 |
* 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
|
679 |
* this interfaces allows to easily add new pluggable method check routines. |
10 | 680 |
*/ |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
681 |
interface MethodCheck { |
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 |
* 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
|
684 |
* 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
|
685 |
* 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
|
686 |
* is assumed to be thrown. |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
687 |
*/ |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
688 |
void argumentsAcceptable(Env<AttrContext> env, |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
689 |
DeferredAttrContext deferredAttrContext, |
8229
39266c1b1b0e
6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents:
8228
diff
changeset
|
690 |
List<Type> argtypes, |
10 | 691 |
List<Type> formals, |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
692 |
Warner warn); |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
693 |
|
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
694 |
/** |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
695 |
* 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
|
696 |
* most specific check. |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
697 |
*/ |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
698 |
MethodCheck mostSpecificCheck(List<Type> actuals); |
11707
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
699 |
} |
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
700 |
|
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
701 |
/** |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
702 |
* Helper enum defining all method check diagnostics (used by resolveMethodCheck). |
11707
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
703 |
*/ |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
704 |
enum MethodCheckDiag { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
705 |
/** |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
706 |
* Actuals and formals differs in length. |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
707 |
*/ |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
708 |
ARITY_MISMATCH("arg.length.mismatch", "infer.arg.length.mismatch"), |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
709 |
/** |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
710 |
* An actual is incompatible with a formal. |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
711 |
*/ |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
712 |
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
|
713 |
/** |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
714 |
* An actual is incompatible with the varargs element type. |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
715 |
*/ |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
716 |
VARARG_MISMATCH("varargs.argument.mismatch", "infer.varargs.argument.mismatch"), |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
717 |
/** |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
718 |
* The varargs element type is inaccessible. |
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 |
INACCESSIBLE_VARARGS("inaccessible.varargs.type", "inaccessible.varargs.type"); |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
721 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
722 |
final String basicKey; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
723 |
final String inferKey; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
724 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
725 |
MethodCheckDiag(String basicKey, String inferKey) { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
726 |
this.basicKey = basicKey; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
727 |
this.inferKey = inferKey; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
728 |
} |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
729 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
730 |
String regex() { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
731 |
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
|
732 |
} |
11707
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
733 |
} |
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
734 |
|
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
735 |
/** |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
736 |
* 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
|
737 |
* of their formal parameter types. |
11707
532f41763bc9
7129801: Merge the two method applicability routines
mcimadamore
parents:
10950
diff
changeset
|
738 |
*/ |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
739 |
MethodCheck nilMethodCheck = new MethodCheck() { |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
740 |
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
|
741 |
//do nothing - method always applicable regardless of actuals |
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 |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
744 |
public MethodCheck mostSpecificCheck(List<Type> actuals) { |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
745 |
return this; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
746 |
} |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
747 |
}; |
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 |
/** |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
750 |
* 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
|
751 |
* 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
|
752 |
* 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
|
753 |
*/ |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
754 |
abstract class AbstractMethodCheck implements MethodCheck { |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
755 |
@Override |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
756 |
public void argumentsAcceptable(final Env<AttrContext> env, |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
757 |
DeferredAttrContext deferredAttrContext, |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
758 |
List<Type> argtypes, |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
759 |
List<Type> formals, |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
760 |
Warner warn) { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
761 |
//should we expand formals? |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
762 |
boolean useVarargs = deferredAttrContext.phase.isVarargsRequired(); |
34854
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
763 |
JCTree callTree = treeForDiagnostics(env); |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
764 |
List<JCExpression> trees = TreeInfo.args(callTree); |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
765 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
766 |
//inference context used during this method check |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
767 |
InferenceContext inferenceContext = deferredAttrContext.inferenceContext; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
768 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
769 |
Type varargsFormal = useVarargs ? formals.last() : null; |
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 |
if (varargsFormal == null && |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
772 |
argtypes.size() != formals.size()) { |
34854
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
773 |
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
|
774 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
775 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
776 |
while (argtypes.nonEmpty() && formals.head != varargsFormal) { |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
777 |
DiagnosticPosition pos = trees != null ? trees.head : null; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
778 |
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
|
779 |
argtypes = argtypes.tail; |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
780 |
formals = formals.tail; |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
781 |
trees = trees != null ? trees.tail : trees; |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
782 |
} |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
783 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
784 |
if (formals.head != varargsFormal) { |
34854
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
785 |
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
|
786 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
787 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
788 |
if (useVarargs) { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
789 |
//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
|
790 |
//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
|
791 |
final Type elt = types.elemtype(varargsFormal); |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
792 |
while (argtypes.nonEmpty()) { |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
793 |
DiagnosticPosition pos = trees != null ? trees.head : null; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
794 |
checkArg(pos, true, argtypes.head, elt, deferredAttrContext, warn); |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
795 |
argtypes = argtypes.tail; |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
796 |
trees = trees != null ? trees.tail : trees; |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
14045
diff
changeset
|
797 |
} |
8229
39266c1b1b0e
6313164: javac generates code that fails byte code verification for the varargs feature
mcimadamore
parents:
8228
diff
changeset
|
798 |
} |
10 | 799 |
} |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
800 |
|
34854
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
801 |
// where |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
802 |
private JCTree treeForDiagnostics(Env<AttrContext> env) { |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
803 |
return env.info.preferredTreeForDiagnostics != null ? env.info.preferredTreeForDiagnostics : env.tree; |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
804 |
} |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
805 |
|
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
806 |
/** |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
807 |
* 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
|
808 |
*/ |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
809 |
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
|
810 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
811 |
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
|
812 |
boolean inferDiag = inferenceContext != infer.emptyContext; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
813 |
InapplicableMethodException ex = inferDiag ? |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
814 |
infer.inferenceException : inapplicableMethodException; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
815 |
if (inferDiag && (!diag.inferKey.equals(diag.basicKey))) { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
816 |
Object[] args2 = new Object[args.length + 1]; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
817 |
System.arraycopy(args, 0, args2, 1, args.length); |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
818 |
args2[0] = inferenceContext.inferenceVars(); |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
819 |
args = args2; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
820 |
} |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
821 |
String key = inferDiag ? diag.inferKey : diag.basicKey; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
822 |
throw ex.setMessage(diags.create(DiagnosticType.FRAGMENT, log.currentSource(), pos, key, args)); |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
823 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
824 |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
825 |
public MethodCheck mostSpecificCheck(List<Type> actuals) { |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
826 |
return nilMethodCheck; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
827 |
} |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
828 |
|
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
829 |
} |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
830 |
|
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
831 |
/** |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
832 |
* 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
|
833 |
* supplied conforms to the method signature. |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
834 |
*/ |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
835 |
MethodCheck arityMethodCheck = new AbstractMethodCheck() { |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
836 |
@Override |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
837 |
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
|
838 |
//do nothing - actual always compatible to formals |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
839 |
} |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
840 |
|
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
841 |
@Override |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
842 |
public String toString() { |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
843 |
return "arityMethodCheck"; |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
844 |
} |
16805
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 |
/** |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
848 |
* 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
|
849 |
* 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
|
850 |
* 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
|
851 |
* |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
852 |
* 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
|
853 |
* 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
|
854 |
* 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
|
855 |
* 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
|
856 |
* |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
857 |
* 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
|
858 |
* 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
|
859 |
* 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
|
860 |
* 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
|
861 |
* 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
|
862 |
* |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
863 |
* 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
|
864 |
*/ |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
865 |
MethodCheck resolveMethodCheck = new AbstractMethodCheck() { |
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 |
@Override |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
868 |
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
|
869 |
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
|
870 |
mresult.check(pos, actual); |
16805
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 |
|
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
873 |
@Override |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
874 |
public void argumentsAcceptable(final Env<AttrContext> env, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
875 |
DeferredAttrContext deferredAttrContext, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
876 |
List<Type> argtypes, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
877 |
List<Type> formals, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
878 |
Warner warn) { |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
879 |
super.argumentsAcceptable(env, deferredAttrContext, argtypes, formals, warn); |
29958
3463809fbb52
8075520: Varargs access check mishandles capture variables
dlsmith
parents:
29776
diff
changeset
|
880 |
// should we check varargs element type accessibility? |
25435
928866794984
8049075: javac, wildcards and generic vararg method invocation not accepted
vromero
parents:
25279
diff
changeset
|
881 |
if (deferredAttrContext.phase.isVarargsRequired()) { |
29958
3463809fbb52
8075520: Varargs access check mishandles capture variables
dlsmith
parents:
29776
diff
changeset
|
882 |
if (deferredAttrContext.mode == AttrMode.CHECK || !checkVarargsAccessAfterResolution) { |
3463809fbb52
8075520: Varargs access check mishandles capture variables
dlsmith
parents:
29776
diff
changeset
|
883 |
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
|
884 |
} |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
885 |
} |
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 |
|
29958
3463809fbb52
8075520: Varargs access check mishandles capture variables
dlsmith
parents:
29776
diff
changeset
|
888 |
/** |
3463809fbb52
8075520: Varargs access check mishandles capture variables
dlsmith
parents:
29776
diff
changeset
|
889 |
* 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
|
890 |
* 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
|
891 |
* or the method declaration signature (before inference completes). |
3463809fbb52
8075520: Varargs access check mishandles capture variables
dlsmith
parents:
29776
diff
changeset
|
892 |
*/ |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
893 |
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
|
894 |
if (inferenceContext.free(t)) { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
895 |
inferenceContext.addFreeTypeListener(List.of(t), |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
896 |
solvedContext -> varargsAccessible(env, solvedContext.asInstType(t), solvedContext)); |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
897 |
} else { |
29958
3463809fbb52
8075520: Varargs access check mishandles capture variables
dlsmith
parents:
29776
diff
changeset
|
898 |
if (!isAccessible(env, types.erasure(t))) { |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
899 |
Symbol location = env.enclClass.sym; |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
900 |
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
|
901 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
902 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
903 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
904 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
905 |
private ResultInfo methodCheckResult(final boolean varargsCheck, Type to, |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
906 |
final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
907 |
CheckContext checkContext = new MethodCheckContext(!deferredAttrContext.phase.isBoxingRequired(), deferredAttrContext, rsWarner) { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
908 |
MethodCheckDiag methodDiag = varargsCheck ? |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
909 |
MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
910 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
911 |
@Override |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
912 |
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
|
913 |
reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details); |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
914 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
915 |
}; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
916 |
return new MethodResultInfo(to, checkContext); |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
917 |
} |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
918 |
|
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
919 |
@Override |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
920 |
public MethodCheck mostSpecificCheck(List<Type> actuals) { |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
921 |
return new MostSpecificCheck(actuals); |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
922 |
} |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
923 |
|
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
924 |
@Override |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
925 |
public String toString() { |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
926 |
return "resolveMethodCheck"; |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
927 |
} |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
928 |
}; |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
929 |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
930 |
/** |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
931 |
* This class handles method reference applicability checks; since during |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
932 |
* 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
|
933 |
* 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
|
934 |
* extended so that inference variables are 'opened' as needed. |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
935 |
*/ |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
936 |
class MethodReferenceCheck extends AbstractMethodCheck { |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
937 |
|
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
938 |
InferenceContext pendingInferenceContext; |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
939 |
|
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
940 |
MethodReferenceCheck(InferenceContext pendingInferenceContext) { |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
941 |
this.pendingInferenceContext = pendingInferenceContext; |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
942 |
} |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
943 |
|
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
944 |
@Override |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
945 |
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
|
946 |
ResultInfo mresult = methodCheckResult(varargs, formal, deferredAttrContext, warn); |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
947 |
mresult.check(pos, actual); |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
948 |
} |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
949 |
|
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
950 |
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
|
951 |
final DeferredAttr.DeferredAttrContext deferredAttrContext, Warner rsWarner) { |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
952 |
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
|
953 |
MethodCheckDiag methodDiag = varargsCheck ? |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
954 |
MethodCheckDiag.VARARG_MISMATCH : MethodCheckDiag.ARG_MISMATCH; |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
955 |
|
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
956 |
@Override |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
957 |
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
|
958 |
found = pendingInferenceContext.asUndetVar(found); |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
959 |
if (found.hasTag(UNDETVAR) && req.isPrimitive()) { |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
960 |
req = types.boxedClass(req).type; |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
961 |
} |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
962 |
return super.compatible(found, req, warn); |
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 |
@Override |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
966 |
public void report(DiagnosticPosition pos, JCDiagnostic details) { |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
967 |
reportMC(pos, methodDiag, deferredAttrContext.inferenceContext, details); |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
968 |
} |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
969 |
}; |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
970 |
return new MethodResultInfo(to, checkContext); |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
971 |
} |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
972 |
|
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
973 |
@Override |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
974 |
public MethodCheck mostSpecificCheck(List<Type> actuals) { |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
975 |
return new MostSpecificCheck(actuals); |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
976 |
} |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
977 |
|
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
978 |
@Override |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
979 |
public String toString() { |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
980 |
return "MethodReferenceCheck"; |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
981 |
} |
22163 | 982 |
} |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
983 |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
984 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
985 |
* 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
|
986 |
* context might contain inference variables. |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
987 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
988 |
abstract class MethodCheckContext implements CheckContext { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
989 |
|
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
990 |
boolean strict; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
991 |
DeferredAttrContext deferredAttrContext; |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
992 |
Warner rsWarner; |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
993 |
|
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
994 |
public MethodCheckContext(boolean strict, DeferredAttrContext deferredAttrContext, Warner rsWarner) { |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
995 |
this.strict = strict; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
996 |
this.deferredAttrContext = deferredAttrContext; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
997 |
this.rsWarner = rsWarner; |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
998 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
999 |
|
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1000 |
public boolean compatible(Type found, Type req, Warner warn) { |
25279 | 1001 |
InferenceContext inferenceContext = deferredAttrContext.inferenceContext; |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1002 |
return strict ? |
25279 | 1003 |
types.isSubtypeUnchecked(inferenceContext.asUndetVar(found), inferenceContext.asUndetVar(req), warn) : |
1004 |
types.isConvertible(inferenceContext.asUndetVar(found), inferenceContext.asUndetVar(req), warn); |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1005 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1006 |
|
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
1007 |
public void report(DiagnosticPosition pos, JCDiagnostic details) { |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1008 |
throw inapplicableMethodException.setMessage(details); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1009 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1010 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1011 |
public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1012 |
return rsWarner; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1013 |
} |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
14045
diff
changeset
|
1014 |
|
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
14045
diff
changeset
|
1015 |
public InferenceContext inferenceContext() { |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1016 |
return deferredAttrContext.inferenceContext; |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
14045
diff
changeset
|
1017 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1018 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1019 |
public DeferredAttrContext deferredAttrContext() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1020 |
return deferredAttrContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1021 |
} |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1022 |
|
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1023 |
@Override |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1024 |
public String toString() { |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1025 |
return "MethodCheckContext"; |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1026 |
} |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1027 |
} |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
1028 |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1029 |
/** |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1030 |
* 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
|
1031 |
* for deferred types goes through special path. |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1032 |
*/ |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1033 |
class MethodResultInfo extends ResultInfo { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1034 |
|
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1035 |
public MethodResultInfo(Type pt, CheckContext checkContext) { |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1036 |
attr.super(KindSelector.VAL, pt, checkContext); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1037 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1038 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1039 |
@Override |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1040 |
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
|
1041 |
if (found.hasTag(DEFERRED)) { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1042 |
DeferredType dt = (DeferredType)found; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1043 |
return dt.check(this); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1044 |
} else { |
28336
9a6ae3c3efb5
8066871: java.lang.VerifyError: Bad local variable type - local final String
mcimadamore
parents:
28331
diff
changeset
|
1045 |
Type uResult = U(found); |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1046 |
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
|
1047 |
types.capture(uResult) : |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1048 |
checkContext.inferenceContext() |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1049 |
.cachedCapture(pos.getTree(), uResult, true); |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
23132
diff
changeset
|
1050 |
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
|
1051 |
} |
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 |
|
18911 | 1054 |
/** |
1055 |
* javac has a long-standing 'simplification' (see 6391995): |
|
1056 |
* given an actual argument type, the method check is performed |
|
1057 |
* on its upper bound. This leads to inconsistencies when an |
|
1058 |
* argument type is checked against itself. For example, given |
|
1059 |
* a type-variable T, it is not true that {@code U(T) <: T}, |
|
1060 |
* so we need to guard against that. |
|
1061 |
*/ |
|
1062 |
private Type U(Type found) { |
|
1063 |
return found == pt ? |
|
24612
75dc732b45af
8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents:
24604
diff
changeset
|
1064 |
found : types.cvarUpperBound(found); |
18911 | 1065 |
} |
1066 |
||
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1067 |
@Override |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1068 |
protected MethodResultInfo dup(Type newPt) { |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1069 |
return new MethodResultInfo(newPt, checkContext); |
14547 | 1070 |
} |
1071 |
||
1072 |
@Override |
|
1073 |
protected ResultInfo dup(CheckContext newContext) { |
|
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1074 |
return new MethodResultInfo(pt, newContext); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
1075 |
} |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1076 |
|
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1077 |
@Override |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1078 |
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
|
1079 |
return new MethodResultInfo(newPt, newContext); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1080 |
} |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1081 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1082 |
|
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1083 |
/** |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1084 |
* 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
|
1085 |
* 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
|
1086 |
* 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
|
1087 |
* argument types A. |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1088 |
*/ |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1089 |
class MostSpecificCheck implements MethodCheck { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1090 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1091 |
List<Type> actuals; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1092 |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1093 |
MostSpecificCheck(List<Type> actuals) { |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1094 |
this.actuals = actuals; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1095 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1096 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1097 |
@Override |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1098 |
public void argumentsAcceptable(final Env<AttrContext> env, |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1099 |
DeferredAttrContext deferredAttrContext, |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1100 |
List<Type> formals1, |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1101 |
List<Type> formals2, |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1102 |
Warner warn) { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1103 |
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
|
1104 |
while (formals2.nonEmpty()) { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1105 |
ResultInfo mresult = methodCheckResult(formals2.head, deferredAttrContext, warn, actuals.head); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1106 |
mresult.check(null, formals1.head); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1107 |
formals1 = formals1.tail; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1108 |
formals2 = formals2.tail; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1109 |
actuals = actuals.isEmpty() ? actuals : actuals.tail; |
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 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1113 |
/** |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1114 |
* 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
|
1115 |
*/ |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1116 |
ResultInfo methodCheckResult(Type to, DeferredAttr.DeferredAttrContext deferredAttrContext, |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1117 |
Warner rsWarner, Type actual) { |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1118 |
return attr.new ResultInfo(KindSelector.VAL, to, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1119 |
new MostSpecificCheckContext(deferredAttrContext, rsWarner, actual)); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1120 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1121 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1122 |
/** |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1123 |
* 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
|
1124 |
* 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
|
1125 |
* a full blown structural analysis is carried out. |
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 |
class MostSpecificCheckContext extends MethodCheckContext { |
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 |
Type actual; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1130 |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1131 |
public MostSpecificCheckContext(DeferredAttrContext deferredAttrContext, Warner rsWarner, Type actual) { |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1132 |
super(true, deferredAttrContext, rsWarner); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1133 |
this.actual = actual; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1134 |
} |
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 |
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
|
1137 |
if (allowFunctionalInterfaceMostSpecific && |
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1138 |
unrelatedFunctionalInterfaces(found, req) && |
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1139 |
(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
|
1140 |
DeferredType dt = (DeferredType) actual; |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1141 |
JCTree speculativeTree = dt.speculativeTree(deferredAttrContext); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1142 |
if (speculativeTree != deferredAttr.stuckTree) { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1143 |
return functionalInterfaceMostSpecific(found, req, speculativeTree); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1144 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1145 |
} |
29146
7115a5967ed1
8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents:
29051
diff
changeset
|
1146 |
return compatibleBySubtyping(found, req); |
7115a5967ed1
8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents:
29051
diff
changeset
|
1147 |
} |
7115a5967ed1
8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents:
29051
diff
changeset
|
1148 |
|
7115a5967ed1
8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents:
29051
diff
changeset
|
1149 |
private boolean compatibleBySubtyping(Type found, Type req) { |
7115a5967ed1
8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents:
29051
diff
changeset
|
1150 |
if (!strict && found.isPrimitive() != req.isPrimitive()) { |
7115a5967ed1
8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents:
29051
diff
changeset
|
1151 |
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
|
1152 |
} |
7115a5967ed1
8039214: Inference should not map capture variables to their upper bounds
dlsmith
parents:
29051
diff
changeset
|
1153 |
return types.isSubtypeNoCapture(found, deferredAttrContext.inferenceContext.asUndetVar(req)); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1154 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1155 |
|
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1156 |
/** 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
|
1157 |
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
|
1158 |
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
|
1159 |
types.isFunctionalInterface(s.tsym) && |
38914
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1160 |
unrelatedInterfaces(t, s); |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1161 |
} |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1162 |
|
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1163 |
/** 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
|
1164 |
private boolean unrelatedInterfaces(Type t, Type s) { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1165 |
if (t.isCompound()) { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1166 |
for (Type ti : types.interfaces(t)) { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1167 |
if (!unrelatedInterfaces(ti, s)) { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1168 |
return false; |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1169 |
} |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1170 |
} |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1171 |
return true; |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1172 |
} else if (s.isCompound()) { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1173 |
for (Type si : types.interfaces(s)) { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1174 |
if (!unrelatedInterfaces(t, si)) { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1175 |
return false; |
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 |
return true; |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1179 |
} else { |
2f652b30f1b0
8037804: Implement specified test for related functional interface types
dlsmith
parents:
38913
diff
changeset
|
1180 |
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
|
1181 |
} |
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1182 |
} |
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1183 |
|
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1184 |
/** 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
|
1185 |
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
|
1186 |
Type tDesc = types.findDescriptorType(types.capture(t)); |
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1187 |
Type tDescNoCapture = types.findDescriptorType(t); |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1188 |
Type sDesc = types.findDescriptorType(s); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1189 |
final List<Type> tTypeParams = tDesc.getTypeArguments(); |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1190 |
final List<Type> tTypeParamsNoCapture = tDescNoCapture.getTypeArguments(); |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1191 |
final List<Type> sTypeParams = sDesc.getTypeArguments(); |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1192 |
|
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1193 |
// compare type parameters |
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1194 |
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
|
1195 |
return false; |
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1196 |
} |
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1197 |
// 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
|
1198 |
List<Type> tIter = tTypeParams; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1199 |
List<Type> sIter = sTypeParams; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1200 |
while (tIter.nonEmpty() && sIter.nonEmpty()) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1201 |
Type tBound = tIter.head.getUpperBound(); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1202 |
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
|
1203 |
if (tBound.containsAny(tTypeParams) && inferenceContext().free(sBound)) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1204 |
return false; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1205 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1206 |
if (!types.isSameType(tBound, inferenceContext().asUndetVar(sBound))) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1207 |
return false; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1208 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1209 |
tIter = tIter.tail; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1210 |
sIter = sIter.tail; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1211 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1212 |
if (!tIter.isEmpty() || !sIter.isEmpty()) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1213 |
return false; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1214 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1215 |
|
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1216 |
// compare parameters |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1217 |
List<Type> tParams = tDesc.getParameterTypes(); |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1218 |
List<Type> tParamsNoCapture = tDescNoCapture.getParameterTypes(); |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1219 |
List<Type> sParams = sDesc.getParameterTypes(); |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1220 |
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
|
1221 |
Type tParam = tParams.head; |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1222 |
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
|
1223 |
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
|
1224 |
if (tParam.containsAny(tTypeParams) && inferenceContext().free(sParam)) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1225 |
return false; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1226 |
} |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1227 |
if (!types.isSubtype(inferenceContext().asUndetVar(sParam), tParam)) { |
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1228 |
return false; |
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1229 |
} |
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1230 |
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
|
1231 |
return false; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1232 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1233 |
tParams = tParams.tail; |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1234 |
tParamsNoCapture = tParamsNoCapture.tail; |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1235 |
sParams = sParams.tail; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1236 |
} |
38913
5b15a5ed3b0d
8144767: Fix handling of capture variables in most-specific test
dlsmith
parents:
36996
diff
changeset
|
1237 |
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
|
1238 |
return false; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1239 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1240 |
|
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1241 |
// compare returns |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1242 |
Type tRet = tDesc.getReturnType(); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1243 |
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
|
1244 |
if (tRet.containsAny(tTypeParams) && inferenceContext().free(sRet)) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1245 |
return false; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1246 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1247 |
MostSpecificFunctionReturnChecker msc = new MostSpecificFunctionReturnChecker(tRet, sRet); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1248 |
msc.scan(tree); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1249 |
return msc.result; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1250 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1251 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1252 |
/** |
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1253 |
* 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
|
1254 |
* 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
|
1255 |
*/ |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1256 |
class MostSpecificFunctionReturnChecker extends DeferredAttr.PolyScanner { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1257 |
|
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1258 |
final Type tRet; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1259 |
final Type sRet; |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1260 |
boolean result; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1261 |
|
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1262 |
/** 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
|
1263 |
MostSpecificFunctionReturnChecker(Type tRet, Type sRet) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1264 |
this.tRet = tRet; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1265 |
this.sRet = sRet; |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1266 |
result = true; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1267 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1268 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1269 |
@Override |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1270 |
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
|
1271 |
result &= false; |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1272 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1273 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1274 |
@Override |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1275 |
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
|
1276 |
scan(asExpr(tree.truepart)); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1277 |
scan(asExpr(tree.falsepart)); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1278 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1279 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1280 |
@Override |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1281 |
public void visitReference(JCMemberReference tree) { |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1282 |
if (sRet.hasTag(VOID)) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1283 |
result &= true; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1284 |
} 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
|
1285 |
result &= false; |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1286 |
} else if (tRet.isPrimitive() != sRet.isPrimitive()) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1287 |
boolean retValIsPrimitive = |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1288 |
tree.refPolyKind == PolyKind.STANDALONE && |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1289 |
tree.sym.type.getReturnType().isPrimitive(); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1290 |
result &= (retValIsPrimitive == tRet.isPrimitive()) && |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1291 |
(retValIsPrimitive != sRet.isPrimitive()); |
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1292 |
} else { |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1293 |
result &= compatibleBySubtyping(tRet, sRet); |
15374
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 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1296 |
|
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1297 |
@Override |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1298 |
public void visitParens(JCParens tree) { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1299 |
scan(asExpr(tree.expr)); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1300 |
} |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1301 |
|
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1302 |
@Override |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1303 |
public void visitLambda(JCLambda tree) { |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1304 |
if (sRet.hasTag(VOID)) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1305 |
result &= true; |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1306 |
} 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
|
1307 |
result &= false; |
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1308 |
} else { |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1309 |
List<JCExpression> lambdaResults = lambdaResults(tree); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1310 |
if (!lambdaResults.isEmpty() && unrelatedFunctionalInterfaces(tRet, sRet)) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1311 |
for (JCExpression expr : lambdaResults) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1312 |
result &= functionalInterfaceMostSpecific(tRet, sRet, expr); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1313 |
} |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1314 |
} 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
|
1315 |
for (JCExpression expr : lambdaResults) { |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1316 |
boolean retValIsPrimitive = expr.isStandalone() && expr.type.isPrimitive(); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1317 |
result &= (retValIsPrimitive == tRet.isPrimitive()) && |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1318 |
(retValIsPrimitive != sRet.isPrimitive()); |
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1319 |
} |
34992
eaba62b5d8e2
8037789: Surprising more-specific results for lambda bodies with no return expressions
dlsmith
parents:
34854
diff
changeset
|
1320 |
} else { |
34995
e4e19f521ee7
8143852: Implement type variable renaming for functional interface most specific test
dlsmith
parents:
34992
diff
changeset
|
1321 |
result &= compatibleBySubtyping(tRet, sRet); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1322 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1323 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1324 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1325 |
//where |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1326 |
|
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1327 |
private List<JCExpression> lambdaResults(JCLambda lambda) { |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1328 |
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
|
1329 |
return List.of(asExpr((JCExpression) lambda.body)); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1330 |
} else { |
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1331 |
final ListBuffer<JCExpression> buffer = new ListBuffer<>(); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1332 |
DeferredAttr.LambdaReturnScanner lambdaScanner = |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1333 |
new DeferredAttr.LambdaReturnScanner() { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1334 |
@Override |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1335 |
public void visitReturn(JCReturn tree) { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1336 |
if (tree.expr != null) { |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1337 |
buffer.append(asExpr(tree.expr)); |
15374
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 |
}; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1341 |
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
|
1342 |
return buffer.toList(); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1343 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1344 |
} |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1345 |
|
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1346 |
private JCExpression asExpr(JCExpression expr) { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1347 |
if (expr.type.hasTag(DEFERRED)) { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1348 |
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
|
1349 |
if (speculativeTree != deferredAttr.stuckTree) { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1350 |
expr = (JCExpression)speculativeTree; |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1351 |
} |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1352 |
} |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1353 |
return expr; |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
32545
diff
changeset
|
1354 |
} |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1355 |
} |
24404
cf534ffbc9d8
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
dlsmith
parents:
24400
diff
changeset
|
1356 |
|
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1357 |
} |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1358 |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1359 |
public MethodCheck mostSpecificCheck(List<Type> actuals) { |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1360 |
Assert.error("Cannot get here!"); |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1361 |
return null; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1362 |
} |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1363 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1364 |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1365 |
public static class InapplicableMethodException extends RuntimeException { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1366 |
private static final long serialVersionUID = 0; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1367 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1368 |
JCDiagnostic diagnostic; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1369 |
JCDiagnostic.Factory diags; |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
1370 |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1371 |
InapplicableMethodException(JCDiagnostic.Factory diags) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1372 |
this.diagnostic = null; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1373 |
this.diags = diags; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1374 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1375 |
InapplicableMethodException setMessage() { |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
14045
diff
changeset
|
1376 |
return setMessage((JCDiagnostic)null); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1377 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1378 |
InapplicableMethodException setMessage(String key) { |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
14045
diff
changeset
|
1379 |
return setMessage(key != null ? diags.fragment(key) : null); |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
1380 |
} |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1381 |
InapplicableMethodException setMessage(String key, Object... args) { |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
14045
diff
changeset
|
1382 |
return setMessage(key != null ? diags.fragment(key, args) : null); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1383 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1384 |
InapplicableMethodException setMessage(JCDiagnostic diag) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1385 |
this.diagnostic = diag; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1386 |
return this; |
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 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12082
diff
changeset
|
1393 |
private final InapplicableMethodException inapplicableMethodException; |
10 | 1394 |
|
1395 |
/* *************************************************************************** |
|
1396 |
* Symbol lookup |
|
1397 |
* the following naming conventions for arguments are used |
|
1398 |
* |
|
1399 |
* env is the environment where the symbol was mentioned |
|
1400 |
* site is the type of which the symbol is a member |
|
1401 |
* name is the symbol's name |
|
1402 |
* if no arguments are given |
|
1403 |
* argtypes are the value arguments, if we search for a method |
|
1404 |
* |
|
1405 |
* If no symbol was found, a ResolveError detailing the problem is returned. |
|
1406 |
****************************************************************************/ |
|
1407 |
||
1408 |
/** Find field. Synthetic fields are always skipped. |
|
1409 |
* @param env The current environment. |
|
1410 |
* @param site The original type from where the selection takes place. |
|
1411 |
* @param name The name of the field. |
|
1412 |
* @param c The class to search for the field. This is always |
|
1413 |
* a superclass or implemented interface of site's class. |
|
1414 |
*/ |
|
1415 |
Symbol findField(Env<AttrContext> env, |
|
1416 |
Type site, |
|
1417 |
Name name, |
|
1418 |
TypeSymbol c) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
1419 |
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
|
1420 |
c = c.type.getUpperBound().tsym; |
10 | 1421 |
Symbol bestSoFar = varNotFound; |
1422 |
Symbol sym; |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1423 |
for (Symbol s : c.members().getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1424 |
if (s.kind == VAR && (s.flags_field & SYNTHETIC) == 0) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1425 |
return isAccessible(env, site, s) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1426 |
? s : new AccessError(env, site, s); |
10 | 1427 |
} |
1428 |
} |
|
1429 |
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
|
1430 |
if (st != null && (st.hasTag(CLASS) || st.hasTag(TYPEVAR))) { |
10 | 1431 |
sym = findField(env, site, name, st.tsym); |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1432 |
bestSoFar = bestOf(bestSoFar, sym); |
10 | 1433 |
} |
1434 |
for (List<Type> l = types.interfaces(c.type); |
|
1435 |
bestSoFar.kind != AMBIGUOUS && l.nonEmpty(); |
|
1436 |
l = l.tail) { |
|
1437 |
sym = findField(env, site, name, l.head.tsym); |
|
18378
00267721fe3a
6360970: javac erroneously accept ambiguous field reference
mcimadamore
parents:
17998
diff
changeset
|
1438 |
if (bestSoFar.exists() && sym.exists() && |
10 | 1439 |
sym.owner != bestSoFar.owner) |
1440 |
bestSoFar = new AmbiguityError(bestSoFar, sym); |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1441 |
else |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1442 |
bestSoFar = bestOf(bestSoFar, sym); |
10 | 1443 |
} |
1444 |
return bestSoFar; |
|
1445 |
} |
|
1446 |
||
1447 |
/** Resolve a field identifier, throw a fatal error if not found. |
|
1448 |
* @param pos The position to use for error reporting. |
|
1449 |
* @param env The environment current at the method invocation. |
|
1450 |
* @param site The type of the qualifying expression, in which |
|
1451 |
* identifier is searched. |
|
1452 |
* @param name The identifier's name. |
|
1453 |
*/ |
|
1454 |
public VarSymbol resolveInternalField(DiagnosticPosition pos, Env<AttrContext> env, |
|
1455 |
Type site, Name name) { |
|
1456 |
Symbol sym = findField(env, site, name, site.tsym); |
|
1457 |
if (sym.kind == VAR) return (VarSymbol)sym; |
|
1458 |
else throw new FatalError( |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
1459 |
diags.fragment(Fragments.FatalErrCantLocateField(name))); |
10 | 1460 |
} |
1461 |
||
1462 |
/** Find unqualified variable or field with given name. |
|
1463 |
* Synthetic fields always skipped. |
|
1464 |
* @param env The current environment. |
|
1465 |
* @param name The name of the variable or field. |
|
1466 |
*/ |
|
1467 |
Symbol findVar(Env<AttrContext> env, Name name) { |
|
1468 |
Symbol bestSoFar = varNotFound; |
|
1469 |
Env<AttrContext> env1 = env; |
|
1470 |
boolean staticOnly = false; |
|
1471 |
while (env1.outer != null) { |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1472 |
Symbol sym = null; |
10 | 1473 |
if (isStatic(env1)) staticOnly = true; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1474 |
for (Symbol s : env1.info.scope.getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1475 |
if (s.kind == VAR && (s.flags_field & SYNTHETIC) == 0) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1476 |
sym = s; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1477 |
break; |
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 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1480 |
if (sym == null) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1481 |
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
|
1482 |
} |
10 | 1483 |
if (sym.exists()) { |
1484 |
if (staticOnly && |
|
1485 |
sym.kind == VAR && |
|
1486 |
sym.owner.kind == TYP && |
|
1487 |
(sym.flags() & STATIC) == 0) |
|
1488 |
return new StaticError(sym); |
|
1489 |
else |
|
1490 |
return sym; |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1491 |
} else { |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1492 |
bestSoFar = bestOf(bestSoFar, sym); |
10 | 1493 |
} |
1494 |
||
1495 |
if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true; |
|
1496 |
env1 = env1.outer; |
|
1497 |
} |
|
1498 |
||
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1499 |
Symbol sym = findField(env, syms.predefClass.type, name, syms.predefClass); |
10 | 1500 |
if (sym.exists()) |
1501 |
return sym; |
|
1502 |
if (bestSoFar.exists()) |
|
1503 |
return bestSoFar; |
|
1504 |
||
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
|
1505 |
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
|
1506 |
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
|
1507 |
for (Symbol currentSymbol : sc.getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1508 |
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
|
1509 |
continue; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1510 |
// 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
|
1511 |
if (!bestSoFar.kind.isResolutionError() && |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1512 |
currentSymbol.owner != bestSoFar.owner) |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1513 |
return new AmbiguityError(bestSoFar, currentSymbol); |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1514 |
else if (!bestSoFar.kind.betterThan(VAR)) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1515 |
origin = sc.getOrigin(currentSymbol).owner; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1516 |
bestSoFar = isAccessible(env, origin.type, currentSymbol) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1517 |
? 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
|
1518 |
} |
10 | 1519 |
} |
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
|
1520 |
if (bestSoFar.exists()) break; |
10 | 1521 |
} |
1522 |
if (bestSoFar.kind == VAR && bestSoFar.owner.type != origin.type) |
|
1523 |
return bestSoFar.clone(origin); |
|
1524 |
else |
|
1525 |
return bestSoFar; |
|
1526 |
} |
|
1527 |
||
1528 |
Warner noteWarner = new Warner(); |
|
1529 |
||
1530 |
/** Select the best method for a call site among two choices. |
|
1531 |
* @param env The current environment. |
|
1532 |
* @param site The original type from where the |
|
1533 |
* selection takes place. |
|
1534 |
* @param argtypes The invocation's value arguments, |
|
1535 |
* @param typeargtypes The invocation's type arguments, |
|
1536 |
* @param sym Proposed new best match. |
|
1537 |
* @param bestSoFar Previously found best match. |
|
1538 |
* @param allowBoxing Allow boxing conversions of arguments. |
|
1539 |
* @param useVarargs Box trailing arguments into an array for varargs. |
|
1540 |
*/ |
|
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
1541 |
@SuppressWarnings("fallthrough") |
10 | 1542 |
Symbol selectBest(Env<AttrContext> env, |
1543 |
Type site, |
|
1544 |
List<Type> argtypes, |
|
1545 |
List<Type> typeargtypes, |
|
1546 |
Symbol sym, |
|
1547 |
Symbol bestSoFar, |
|
1548 |
boolean allowBoxing, |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1549 |
boolean useVarargs) { |
14444 | 1550 |
if (sym.kind == ERR || |
47942
06652ffab955
8185451: Misleading 'cannot be accessed from outside package' diagnostic for inconsistent varargs override
vromero
parents:
47298
diff
changeset
|
1551 |
(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
|
1552 |
!notOverriddenIn(site, sym)) { |
14444 | 1553 |
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
|
1554 |
} 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
|
1555 |
return bestSoFar.kind.isResolutionError() ? |
24400
f05df7f58567
8037379: fix for JDK-8029569 doesn't cover all possible cases
vromero
parents:
24396
diff
changeset
|
1556 |
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
|
1557 |
bestSoFar; |
14444 | 1558 |
} |
29774
9d438163db79
8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents:
29554
diff
changeset
|
1559 |
Assert.check(!sym.kind.isResolutionError()); |
10 | 1560 |
try { |
32545
9c4c47640408
8073594: javac, before calling rawInstantiate from selectBest the warner should be cleared out
vromero
parents:
32544
diff
changeset
|
1561 |
types.noWarnings.clear(); |
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
1562 |
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
|
1563 |
allowBoxing, useVarargs, types.noWarnings); |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1564 |
currentResolutionContext.addApplicableCandidate(sym, mt); |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
1565 |
} catch (InapplicableMethodException ex) { |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1566 |
currentResolutionContext.addInapplicableCandidate(sym, ex.getDiagnostic()); |
10 | 1567 |
switch (bestSoFar.kind) { |
14444 | 1568 |
case ABSENT_MTH: |
1569 |
return new InapplicableSymbolError(currentResolutionContext); |
|
1570 |
case WRONG_MTH: |
|
1571 |
bestSoFar = new InapplicableSymbolsError(currentResolutionContext); |
|
1572 |
default: |
|
1573 |
return bestSoFar; |
|
10 | 1574 |
} |
1575 |
} |
|
1576 |
if (!isAccessible(env, site, sym)) { |
|
1577 |
return (bestSoFar.kind == ABSENT_MTH) |
|
1578 |
? new AccessError(env, site, sym) |
|
1579 |
: bestSoFar; |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
1580 |
} |
29774
9d438163db79
8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents:
29554
diff
changeset
|
1581 |
return (bestSoFar.kind.isResolutionError() && bestSoFar.kind != AMBIGUOUS) |
10 | 1582 |
? sym |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1583 |
: mostSpecific(argtypes, sym, bestSoFar, env, site, useVarargs); |
10 | 1584 |
} |
1585 |
||
1586 |
/* Return the most specific of the two methods for a call, |
|
1587 |
* given that both are accessible and applicable. |
|
1588 |
* @param m1 A new candidate for most specific. |
|
1589 |
* @param m2 The previous most specific candidate. |
|
1590 |
* @param env The current environment. |
|
1591 |
* @param site The original type from where the selection |
|
1592 |
* takes place. |
|
1593 |
* @param allowBoxing Allow boxing conversions of arguments. |
|
1594 |
* @param useVarargs Box trailing arguments into an array for varargs. |
|
1595 |
*/ |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1596 |
Symbol mostSpecific(List<Type> argtypes, Symbol m1, |
10 | 1597 |
Symbol m2, |
1598 |
Env<AttrContext> env, |
|
2511 | 1599 |
final Type site, |
10 | 1600 |
boolean useVarargs) { |
1601 |
switch (m2.kind) { |
|
1602 |
case MTH: |
|
1603 |
if (m1 == m2) return m1; |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1604 |
boolean m1SignatureMoreSpecific = |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1605 |
signatureMoreSpecific(argtypes, env, site, m1, m2, useVarargs); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1606 |
boolean m2SignatureMoreSpecific = |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1607 |
signatureMoreSpecific(argtypes, env, site, m2, m1, useVarargs); |
10 | 1608 |
if (m1SignatureMoreSpecific && m2SignatureMoreSpecific) { |
7623 | 1609 |
Type mt1 = types.memberType(site, m1); |
1610 |
Type mt2 = types.memberType(site, m2); |
|
10 | 1611 |
if (!types.overrideEquivalent(mt1, mt2)) |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1612 |
return ambiguityError(m1, m2); |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1613 |
|
10 | 1614 |
// same signature; select (a) the non-bridge method, or |
1615 |
// (b) the one that overrides the other, or (c) the concrete |
|
1616 |
// 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
|
1617 |
if ((m1.flags() & BRIDGE) != (m2.flags() & BRIDGE)) |
10 | 1618 |
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
|
1619 |
|
10 | 1620 |
// if one overrides or hides the other, use it |
1621 |
TypeSymbol m1Owner = (TypeSymbol)m1.owner; |
|
1622 |
TypeSymbol m2Owner = (TypeSymbol)m2.owner; |
|
1623 |
if (types.asSuper(m1Owner.type, m2Owner) != null && |
|
1624 |
((m1.owner.flags_field & INTERFACE) == 0 || |
|
1625 |
(m2.owner.flags_field & INTERFACE) != 0) && |
|
1626 |
m1.overrides(m2, m1Owner, types, false)) |
|
1627 |
return m1; |
|
1628 |
if (types.asSuper(m2Owner.type, m1Owner) != null && |
|
1629 |
((m2.owner.flags_field & INTERFACE) == 0 || |
|
1630 |
(m1.owner.flags_field & INTERFACE) != 0) && |
|
1631 |
m2.overrides(m1, m2Owner, types, false)) |
|
1632 |
return m2; |
|
1633 |
boolean m1Abstract = (m1.flags() & ABSTRACT) != 0; |
|
1634 |
boolean m2Abstract = (m2.flags() & ABSTRACT) != 0; |
|
1635 |
if (m1Abstract && !m2Abstract) return m2; |
|
1636 |
if (m2Abstract && !m1Abstract) return m1; |
|
1637 |
// both abstract or both concrete |
|
15038 | 1638 |
return ambiguityError(m1, m2); |
10 | 1639 |
} |
1640 |
if (m1SignatureMoreSpecific) return m1; |
|
1641 |
if (m2SignatureMoreSpecific) return m2; |
|
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1642 |
return ambiguityError(m1, m2); |
10 | 1643 |
case AMBIGUOUS: |
24393
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1644 |
//compare m1 to ambiguous methods in m2 |
22161
d79fb23b5dca
8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents:
21718
diff
changeset
|
1645 |
AmbiguityError e = (AmbiguityError)m2.baseSymbol(); |
24393
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1646 |
boolean m1MoreSpecificThanAnyAmbiguous = true; |
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1647 |
boolean allAmbiguousMoreSpecificThanM1 = true; |
15038 | 1648 |
for (Symbol s : e.ambiguousSyms) { |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1649 |
Symbol moreSpecific = mostSpecific(argtypes, m1, s, env, site, useVarargs); |
24393
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1650 |
m1MoreSpecificThanAnyAmbiguous &= moreSpecific == m1; |
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1651 |
allAmbiguousMoreSpecificThanM1 &= moreSpecific == s; |
15038 | 1652 |
} |
24393
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1653 |
if (m1MoreSpecificThanAnyAmbiguous) |
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1654 |
return m1; |
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1655 |
//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
|
1656 |
//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
|
1657 |
if (!allAmbiguousMoreSpecificThanM1) |
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1658 |
e.addAmbiguousSymbol(m1); |
381ade32a034
8041663: Sensitive dependence on location of nested interface
jlahoda
parents:
24293
diff
changeset
|
1659 |
return e; |
10 | 1660 |
default: |
1661 |
throw new AssertionError(); |
|
1662 |
} |
|
1663 |
} |
|
7623 | 1664 |
//where |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1665 |
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
|
1666 |
noteWarner.clear(); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1667 |
int maxLength = Math.max( |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1668 |
Math.max(m1.type.getParameterTypes().length(), actuals.length()), |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1669 |
m2.type.getParameterTypes().length()); |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1670 |
MethodResolutionContext prevResolutionContext = currentResolutionContext; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1671 |
try { |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1672 |
currentResolutionContext = new MethodResolutionContext(); |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1673 |
currentResolutionContext.step = prevResolutionContext.step; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1674 |
currentResolutionContext.methodCheck = |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1675 |
prevResolutionContext.methodCheck.mostSpecificCheck(actuals); |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1676 |
Type mst = instantiate(env, site, m2, null, |
24293
0d889f759fac
8033718: Inference ignores capture variable as upper bound
dlsmith
parents:
24226
diff
changeset
|
1677 |
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
|
1678 |
false, useVarargs, noteWarner); |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1679 |
return mst != null && |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1680 |
!noteWarner.hasLint(Lint.LintCategory.UNCHECKED); |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1681 |
} finally { |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1682 |
currentResolutionContext = prevResolutionContext; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
1683 |
} |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1684 |
} |
19914 | 1685 |
|
1686 |
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
|
1687 |
if ((msym.flags() & VARARGS) != 0 && allowVarargs) { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1688 |
Type varargsElem = types.elemtype(args.last()); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1689 |
if (varargsElem == null) { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1690 |
Assert.error("Bad varargs = " + args.last() + " " + msym); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1691 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1692 |
List<Type> newArgs = args.reverse().tail.prepend(varargsElem).reverse(); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1693 |
while (newArgs.length() < length) { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1694 |
newArgs = newArgs.append(newArgs.last()); |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1695 |
} |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1696 |
return newArgs; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1697 |
} else { |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15362
diff
changeset
|
1698 |
return args; |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
1699 |
} |
7623 | 1700 |
} |
1701 |
//where |
|
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1702 |
Symbol ambiguityError(Symbol m1, Symbol m2) { |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1703 |
if (((m1.flags() | m2.flags()) & CLASH) != 0) { |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1704 |
return (m1.flags() & CLASH) == 0 ? m1 : m2; |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1705 |
} else { |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1706 |
return new AmbiguityError(m1, m2); |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1707 |
} |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
1708 |
} |
10 | 1709 |
|
14444 | 1710 |
Symbol findMethodInScope(Env<AttrContext> env, |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1711 |
Type site, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1712 |
Name name, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1713 |
List<Type> argtypes, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1714 |
List<Type> typeargtypes, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1715 |
Scope sc, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1716 |
Symbol bestSoFar, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1717 |
boolean allowBoxing, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1718 |
boolean useVarargs, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1719 |
boolean abstractok) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1720 |
for (Symbol s : sc.getSymbolsByName(name, new LookupFilter(abstractok))) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1721 |
bestSoFar = selectBest(env, site, argtypes, typeargtypes, s, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1722 |
bestSoFar, allowBoxing, useVarargs); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1723 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1724 |
return bestSoFar; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1725 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1726 |
//where |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1727 |
class LookupFilter implements Filter<Symbol> { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1728 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1729 |
boolean abstractOk; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1730 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1731 |
LookupFilter(boolean abstractOk) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1732 |
this.abstractOk = abstractOk; |
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 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1735 |
public boolean accepts(Symbol s) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1736 |
long flags = s.flags(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1737 |
return s.kind == MTH && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1738 |
(flags & SYNTHETIC) == 0 && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1739 |
(abstractOk || |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1740 |
(flags & DEFAULT) != 0 || |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1741 |
(flags & ABSTRACT) == 0); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1742 |
} |
22163 | 1743 |
} |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1744 |
|
10 | 1745 |
/** Find best qualified method matching given name, type and value |
1746 |
* arguments. |
|
1747 |
* @param env The current environment. |
|
1748 |
* @param site The original type from where the selection |
|
1749 |
* takes place. |
|
1750 |
* @param name The method's name. |
|
1751 |
* @param argtypes The method's value arguments. |
|
1752 |
* @param typeargtypes The method's type arguments |
|
1753 |
* @param allowBoxing Allow boxing conversions of arguments. |
|
1754 |
* @param useVarargs Box trailing arguments into an array for varargs. |
|
1755 |
*/ |
|
1756 |
Symbol findMethod(Env<AttrContext> env, |
|
1757 |
Type site, |
|
1758 |
Name name, |
|
1759 |
List<Type> argtypes, |
|
1760 |
List<Type> typeargtypes, |
|
1761 |
boolean allowBoxing, |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1762 |
boolean useVarargs) { |
5736
ee0850472ca1
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5321
diff
changeset
|
1763 |
Symbol bestSoFar = methodNotFound; |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
1764 |
bestSoFar = findMethod(env, |
10 | 1765 |
site, |
1766 |
name, |
|
1767 |
argtypes, |
|
1768 |
typeargtypes, |
|
1769 |
site.tsym.type, |
|
5736
ee0850472ca1
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5321
diff
changeset
|
1770 |
bestSoFar, |
10 | 1771 |
allowBoxing, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1772 |
useVarargs); |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
1773 |
return bestSoFar; |
10 | 1774 |
} |
1775 |
// where |
|
1776 |
private Symbol findMethod(Env<AttrContext> env, |
|
1777 |
Type site, |
|
1778 |
Name name, |
|
1779 |
List<Type> argtypes, |
|
1780 |
List<Type> typeargtypes, |
|
1781 |
Type intype, |
|
1782 |
Symbol bestSoFar, |
|
1783 |
boolean allowBoxing, |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1784 |
boolean useVarargs) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1785 |
@SuppressWarnings({"unchecked","rawtypes"}) |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1786 |
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
|
1787 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1788 |
InterfaceLookupPhase iphase = InterfaceLookupPhase.ABSTRACT_OK; |
14045 | 1789 |
for (TypeSymbol s : superclasses(intype)) { |
14444 | 1790 |
bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1791 |
s.members(), bestSoFar, allowBoxing, useVarargs, true); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1792 |
if (name == names.init) return bestSoFar; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1793 |
iphase = (iphase == null) ? null : iphase.update(s, this); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1794 |
if (iphase != null) { |
14045 | 1795 |
for (Type itype : types.interfaces(s.type)) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1796 |
itypes[iphase.ordinal()] = types.union(types.closure(itype), itypes[iphase.ordinal()]); |
10 | 1797 |
} |
1798 |
} |
|
14045 | 1799 |
} |
1800 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1801 |
Symbol concrete = bestSoFar.kind.isValid() && |
14045 | 1802 |
(bestSoFar.flags() & ABSTRACT) == 0 ? |
1803 |
bestSoFar : methodNotFound; |
|
1804 |
||
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1805 |
for (InterfaceLookupPhase iphase2 : InterfaceLookupPhase.values()) { |
14045 | 1806 |
//keep searching for abstract methods |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1807 |
for (Type itype : itypes[iphase2.ordinal()]) { |
14045 | 1808 |
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
|
1809 |
if (iphase2 == InterfaceLookupPhase.DEFAULT_OK && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1810 |
(itype.tsym.flags() & DEFAULT) == 0) continue; |
14444 | 1811 |
bestSoFar = findMethodInScope(env, site, name, argtypes, typeargtypes, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1812 |
itype.tsym.members(), bestSoFar, allowBoxing, useVarargs, true); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1813 |
if (concrete != bestSoFar && |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1814 |
concrete.kind.isValid() && |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
1815 |
bestSoFar.kind.isValid() && |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1816 |
types.isSubSignature(concrete.type, bestSoFar.type)) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1817 |
//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
|
1818 |
//most specific ends up comparing abstract methods that might have |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1819 |
//been implemented by some concrete method in a subclass and, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1820 |
//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
|
1821 |
//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
|
1822 |
//to explicitly call that out (see CR 6178365) |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1823 |
bestSoFar = concrete; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1824 |
} |
10 | 1825 |
} |
1826 |
} |
|
1827 |
return bestSoFar; |
|
1828 |
} |
|
1829 |
||
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1830 |
enum InterfaceLookupPhase { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1831 |
ABSTRACT_OK() { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1832 |
@Override |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1833 |
InterfaceLookupPhase update(Symbol s, Resolve rs) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1834 |
//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
|
1835 |
//(as concrete classes are expected to implement all abstracts coming |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1836 |
//from superinterfaces) |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1837 |
if ((s.flags() & (ABSTRACT | INTERFACE | ENUM)) != 0) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1838 |
return this; |
23105
1d1ea26a10ae
8030855: Default methods should be visible under source previous to 8
vromero
parents:
22442
diff
changeset
|
1839 |
} else { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1840 |
return DEFAULT_OK; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1841 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1842 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1843 |
}, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1844 |
DEFAULT_OK() { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1845 |
@Override |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1846 |
InterfaceLookupPhase update(Symbol s, Resolve rs) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1847 |
return this; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1848 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1849 |
}; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1850 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
1851 |
abstract InterfaceLookupPhase update(Symbol s, Resolve rs); |
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 |
|
14045 | 1854 |
/** |
1855 |
* Return an Iterable object to scan the superclasses of a given type. |
|
1856 |
* It's crucial that the scan is done lazily, as we don't want to accidentally |
|
1857 |
* access more supertypes than strictly needed (as this could trigger completion |
|
1858 |
* errors if some of the not-needed supertypes are missing/ill-formed). |
|
1859 |
*/ |
|
1860 |
Iterable<TypeSymbol> superclasses(final Type intype) { |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1861 |
return () -> new Iterator<TypeSymbol>() { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1862 |
|
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1863 |
List<TypeSymbol> seen = List.nil(); |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1864 |
TypeSymbol currentSym = symbolFor(intype); |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1865 |
TypeSymbol prevSym = null; |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1866 |
|
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1867 |
public boolean hasNext() { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1868 |
if (currentSym == syms.noSymbol) { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1869 |
currentSym = symbolFor(types.supertype(prevSym.type)); |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1870 |
} |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1871 |
return currentSym != null; |
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 |
|
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1874 |
public TypeSymbol next() { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1875 |
prevSym = currentSym; |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1876 |
currentSym = syms.noSymbol; |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1877 |
Assert.check(prevSym != null || prevSym != syms.noSymbol); |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1878 |
return prevSym; |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1879 |
} |
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 |
public void remove() { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1882 |
throw new UnsupportedOperationException(); |
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 |
|
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1885 |
TypeSymbol symbolFor(Type t) { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1886 |
if (!t.hasTag(CLASS) && |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1887 |
!t.hasTag(TYPEVAR)) { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1888 |
return null; |
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 |
t = types.skipTypeVars(t, false); |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1891 |
if (seen.contains(t.tsym)) { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1892 |
//degenerate case in which we have a circular |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1893 |
//class hierarchy - because of ill-formed classfiles |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1894 |
return null; |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1895 |
} |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1896 |
seen = seen.prepend(t.tsym); |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1897 |
return t.tsym; |
14045 | 1898 |
} |
1899 |
}; |
|
1900 |
} |
|
1901 |
||
10 | 1902 |
/** Find unqualified method matching given name, type and value arguments. |
1903 |
* @param env The current environment. |
|
1904 |
* @param name The method's name. |
|
1905 |
* @param argtypes The method's value arguments. |
|
1906 |
* @param typeargtypes The method's type arguments. |
|
1907 |
* @param allowBoxing Allow boxing conversions of arguments. |
|
1908 |
* @param useVarargs Box trailing arguments into an array for varargs. |
|
1909 |
*/ |
|
1910 |
Symbol findFun(Env<AttrContext> env, Name name, |
|
1911 |
List<Type> argtypes, List<Type> typeargtypes, |
|
1912 |
boolean allowBoxing, boolean useVarargs) { |
|
1913 |
Symbol bestSoFar = methodNotFound; |
|
1914 |
Env<AttrContext> env1 = env; |
|
1915 |
boolean staticOnly = false; |
|
1916 |
while (env1.outer != null) { |
|
1917 |
if (isStatic(env1)) staticOnly = true; |
|
34854
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1918 |
Assert.check(env1.info.preferredTreeForDiagnostics == null); |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1919 |
env1.info.preferredTreeForDiagnostics = env.tree; |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1920 |
try { |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1921 |
Symbol sym = findMethod( |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1922 |
env1, env1.enclClass.sym.type, name, argtypes, typeargtypes, |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1923 |
allowBoxing, useVarargs); |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1924 |
if (sym.exists()) { |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1925 |
if (staticOnly && |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1926 |
sym.kind == MTH && |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1927 |
sym.owner.kind == TYP && |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1928 |
(sym.flags() & STATIC) == 0) return new StaticError(sym); |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1929 |
else return sym; |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1930 |
} else { |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1931 |
bestSoFar = bestOf(bestSoFar, sym); |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1932 |
} |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1933 |
} finally { |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
1934 |
env1.info.preferredTreeForDiagnostics = null; |
10 | 1935 |
} |
1936 |
if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true; |
|
1937 |
env1 = env1.outer; |
|
1938 |
} |
|
1939 |
||
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1940 |
Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1941 |
typeargtypes, allowBoxing, useVarargs); |
10 | 1942 |
if (sym.exists()) |
1943 |
return sym; |
|
1944 |
||
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1945 |
for (Symbol currentSym : env.toplevel.namedImportScope.getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1946 |
Symbol origin = env.toplevel.namedImportScope.getOrigin(currentSym).owner; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1947 |
if (currentSym.kind == MTH) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1948 |
if (currentSym.owner.type != origin.type) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1949 |
currentSym = currentSym.clone(origin); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1950 |
if (!isAccessible(env, origin.type, currentSym)) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1951 |
currentSym = new AccessError(env, origin.type, currentSym); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1952 |
bestSoFar = selectBest(env, origin.type, |
10 | 1953 |
argtypes, typeargtypes, |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1954 |
currentSym, bestSoFar, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1955 |
allowBoxing, useVarargs); |
10 | 1956 |
} |
1957 |
} |
|
1958 |
if (bestSoFar.exists()) |
|
1959 |
return bestSoFar; |
|
1960 |
||
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1961 |
for (Symbol currentSym : env.toplevel.starImportScope.getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1962 |
Symbol origin = env.toplevel.starImportScope.getOrigin(currentSym).owner; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1963 |
if (currentSym.kind == MTH) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1964 |
if (currentSym.owner.type != origin.type) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1965 |
currentSym = currentSym.clone(origin); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1966 |
if (!isAccessible(env, origin.type, currentSym)) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1967 |
currentSym = new AccessError(env, origin.type, currentSym); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1968 |
bestSoFar = selectBest(env, origin.type, |
10 | 1969 |
argtypes, typeargtypes, |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
1970 |
currentSym, bestSoFar, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
1971 |
allowBoxing, useVarargs); |
10 | 1972 |
} |
1973 |
} |
|
1974 |
return bestSoFar; |
|
1975 |
} |
|
1976 |
||
1977 |
/** Load toplevel or member class with given fully qualified name and |
|
1978 |
* verify that it is accessible. |
|
1979 |
* @param env The current environment. |
|
1980 |
* @param name The fully qualified name of the class to be loaded. |
|
1981 |
*/ |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
1982 |
Symbol loadClass(Env<AttrContext> env, Name name, RecoveryLoadClass recoveryLoadClass) { |
10 | 1983 |
try { |
36526 | 1984 |
ClassSymbol c = finder.loadClass(env.toplevel.modle, name); |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
1985 |
return isAccessible(env, c) ? c : new AccessError(env, null, c); |
24604
7f68545b5128
8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
24404
diff
changeset
|
1986 |
} catch (ClassFinder.BadClassFile err) { |
10 | 1987 |
throw err; |
1988 |
} catch (CompletionFailure ex) { |
|
42824 | 1989 |
Symbol candidate = recoveryLoadClass.loadClass(env, name); |
1990 |
||
1991 |
if (candidate != null) { |
|
1992 |
return candidate; |
|
41931
d7c9720c4223
8166538: Improve error reporting for compiling against unexported package
jlahoda
parents:
41526
diff
changeset
|
1993 |
} |
42824 | 1994 |
|
41931
d7c9720c4223
8166538: Improve error reporting for compiling against unexported package
jlahoda
parents:
41526
diff
changeset
|
1995 |
return typeNotFound; |
d7c9720c4223
8166538: Improve error reporting for compiling against unexported package
jlahoda
parents:
41526
diff
changeset
|
1996 |
} |
d7c9720c4223
8166538: Improve error reporting for compiling against unexported package
jlahoda
parents:
41526
diff
changeset
|
1997 |
} |
d7c9720c4223
8166538: Improve error reporting for compiling against unexported package
jlahoda
parents:
41526
diff
changeset
|
1998 |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
1999 |
public interface RecoveryLoadClass { |
42824 | 2000 |
Symbol loadClass(Env<AttrContext> env, Name name); |
2001 |
} |
|
2002 |
||
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2003 |
private final RecoveryLoadClass noRecovery = (env, name) -> null; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2004 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2005 |
private final RecoveryLoadClass doRecoveryLoadClass = new RecoveryLoadClass() { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2006 |
@Override public Symbol loadClass(Env<AttrContext> env, Name name) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2007 |
List<Name> candidates = Convert.classCandidates(name); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2008 |
return lookupInvisibleSymbol(env, name, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2009 |
n -> () -> createCompoundIterator(candidates, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2010 |
c -> syms.getClassesForName(c) |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2011 |
.iterator()), |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2012 |
(ms, n) -> { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2013 |
for (Name candidate : candidates) { |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2014 |
try { |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2015 |
return finder.loadClass(ms, candidate); |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2016 |
} catch (CompletionFailure cf) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2017 |
//ignore |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2018 |
} |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2019 |
} |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2020 |
return null; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2021 |
}, sym -> sym.kind == Kind.TYP, false, typeNotFound); |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2022 |
} |
42824 | 2023 |
}; |
2024 |
||
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2025 |
private final RecoveryLoadClass namedImportScopeRecovery = (env, name) -> { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2026 |
Scope importScope = env.toplevel.namedImportScope; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2027 |
Symbol existing = importScope.findFirst(Convert.shortName(name), |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2028 |
sym -> sym.kind == TYP && sym.flatName() == name); |
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 |
if (existing != null) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2031 |
return new InvisibleSymbolError(env, true, existing); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2032 |
} |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2033 |
return null; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2034 |
}; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2035 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2036 |
private final RecoveryLoadClass starImportScopeRecovery = (env, name) -> { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2037 |
Scope importScope = env.toplevel.starImportScope; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2038 |
Symbol existing = importScope.findFirst(Convert.shortName(name), |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2039 |
sym -> sym.kind == TYP && sym.flatName() == name); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2040 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2041 |
if (existing != null) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2042 |
try { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2043 |
existing = finder.loadClass(existing.packge().modle, name); |
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 |
return new InvisibleSymbolError(env, true, existing); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2046 |
} catch (CompletionFailure cf) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2047 |
//ignore |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2048 |
} |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2049 |
} |
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 |
return null; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2052 |
}; |
42824 | 2053 |
|
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2054 |
Symbol lookupPackage(Env<AttrContext> env, Name name) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2055 |
PackageSymbol pack = syms.lookupPackage(env.toplevel.modle, name); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2056 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2057 |
if (allowModules && isImportOnDemand(env, name)) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2058 |
pack.complete(); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2059 |
if (!pack.exists()) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2060 |
Name nameAndDot = name.append('.', names.empty); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2061 |
boolean prefixOfKnown = |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2062 |
env.toplevel.modle.visiblePackages.values() |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2063 |
.stream() |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2064 |
.anyMatch(p -> p.fullname.startsWith(nameAndDot)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2065 |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2066 |
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
|
2067 |
sym.complete(); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2068 |
return sym.exists(); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2069 |
}, prefixOfKnown, pack); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2070 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2071 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2072 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2073 |
return pack; |
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 |
private boolean isImportOnDemand(Env<AttrContext> env, Name name) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2077 |
if (!env.tree.hasTag(IMPORT)) |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2078 |
return false; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2079 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2080 |
JCTree qualid = ((JCImport) env.tree).qualid; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2081 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2082 |
if (!qualid.hasTag(SELECT)) |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2083 |
return false; |
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 (TreeInfo.name(qualid) != names.asterisk) |
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 |
return TreeInfo.fullName(((JCFieldAccess) qualid).selected) == name; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2089 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2090 |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2091 |
private <S extends Symbol> Symbol lookupInvisibleSymbol(Env<AttrContext> env, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2092 |
Name name, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2093 |
Function<Name, Iterable<S>> get, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2094 |
BiFunction<ModuleSymbol, Name, S> load, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2095 |
Predicate<S> validate, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2096 |
boolean suppressError, |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2097 |
Symbol defaultResult) { |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2098 |
//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
|
2099 |
//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
|
2100 |
//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
|
2101 |
//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
|
2102 |
Iterable<? extends S> candidates = get.apply(name); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2103 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2104 |
for (S sym : candidates) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2105 |
if (validate.test(sym)) |
43866
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2106 |
return createInvisibleSymbolError(env, suppressError, sym); |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2107 |
} |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2108 |
|
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2109 |
Set<ModuleSymbol> recoverableModules = new HashSet<>(syms.getAllModules()); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2110 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2111 |
recoverableModules.remove(env.toplevel.modle); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2112 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2113 |
for (ModuleSymbol ms : recoverableModules) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2114 |
//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
|
2115 |
//may not be completable with the current compiler settings: |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2116 |
if (ms.sourceLocation == null) { |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2117 |
if (ms.classLocation == null) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2118 |
ms = moduleFinder.findModule(ms); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2119 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2120 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2121 |
if (ms.kind != ERR) { |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2122 |
S sym = load.apply(ms, name); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2123 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2124 |
if (sym != null && validate.test(sym)) { |
43866
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2125 |
return createInvisibleSymbolError(env, suppressError, sym); |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2126 |
} |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2127 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2128 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2129 |
} |
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 |
return defaultResult; |
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 |
|
43866
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2134 |
private Symbol createInvisibleSymbolError(Env<AttrContext> env, boolean suppressError, Symbol sym) { |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2135 |
if (symbolPackageVisible(env, sym)) { |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2136 |
return new AccessError(env, null, sym); |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2137 |
} else { |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2138 |
return new InvisibleSymbolError(env, suppressError, sym); |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2139 |
} |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2140 |
} |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2141 |
|
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2142 |
private boolean symbolPackageVisible(Env<AttrContext> env, Symbol sym) { |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2143 |
ModuleSymbol envMod = env.toplevel.modle; |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2144 |
PackageSymbol symPack = sym.packge(); |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2145 |
return envMod == symPack.modle || |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2146 |
envMod.visiblePackages.containsKey(symPack.fullname); |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2147 |
} |
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
2148 |
|
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2149 |
/** |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2150 |
* 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
|
2151 |
* if none is found. |
10 | 2152 |
* @param env The current environment. |
2153 |
* @param site The original type from where the selection takes |
|
2154 |
* place. |
|
2155 |
* @param name The type's name. |
|
2156 |
* @param c The class to search for the member type. This is |
|
2157 |
* always a superclass or implemented interface of |
|
2158 |
* site's class. |
|
2159 |
*/ |
|
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2160 |
Symbol findImmediateMemberType(Env<AttrContext> env, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2161 |
Type site, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2162 |
Name name, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2163 |
TypeSymbol c) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2164 |
for (Symbol sym : c.members().getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2165 |
if (sym.kind == TYP) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2166 |
return isAccessible(env, site, sym) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2167 |
? sym |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2168 |
: new AccessError(env, site, sym); |
10 | 2169 |
} |
2170 |
} |
|
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2171 |
return typeNotFound; |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2172 |
} |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2173 |
|
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2174 |
/** Find a member type inherited from a superclass or interface. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2175 |
* @param env The current environment. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2176 |
* @param site The original type from where the selection takes |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2177 |
* place. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2178 |
* @param name The type's name. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2179 |
* @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
|
2180 |
* always a superclass or implemented interface of |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2181 |
* site's class. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2182 |
*/ |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2183 |
Symbol findInheritedMemberType(Env<AttrContext> env, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2184 |
Type site, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2185 |
Name name, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2186 |
TypeSymbol c) { |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2187 |
Symbol bestSoFar = typeNotFound; |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2188 |
Symbol sym; |
10 | 2189 |
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
|
2190 |
if (st != null && st.hasTag(CLASS)) { |
10 | 2191 |
sym = findMemberType(env, site, name, st.tsym); |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2192 |
bestSoFar = bestOf(bestSoFar, sym); |
10 | 2193 |
} |
2194 |
for (List<Type> l = types.interfaces(c.type); |
|
2195 |
bestSoFar.kind != AMBIGUOUS && l.nonEmpty(); |
|
2196 |
l = l.tail) { |
|
2197 |
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
|
2198 |
if (!bestSoFar.kind.isResolutionError() && |
9d438163db79
8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents:
29554
diff
changeset
|
2199 |
!sym.kind.isResolutionError() && |
10 | 2200 |
sym.owner != bestSoFar.owner) |
2201 |
bestSoFar = new AmbiguityError(bestSoFar, sym); |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2202 |
else |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2203 |
bestSoFar = bestOf(bestSoFar, sym); |
10 | 2204 |
} |
2205 |
return bestSoFar; |
|
2206 |
} |
|
2207 |
||
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2208 |
/** Find qualified member type. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2209 |
* @param env The current environment. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2210 |
* @param site The original type from where the selection takes |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2211 |
* place. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2212 |
* @param name The type's name. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2213 |
* @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
|
2214 |
* always a superclass or implemented interface of |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2215 |
* site's class. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2216 |
*/ |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2217 |
Symbol findMemberType(Env<AttrContext> env, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2218 |
Type site, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2219 |
Name name, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2220 |
TypeSymbol c) { |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2221 |
Symbol sym = findImmediateMemberType(env, site, name, c); |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2222 |
|
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2223 |
if (sym != typeNotFound) |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2224 |
return sym; |
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 |
return findInheritedMemberType(env, site, name, c); |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2227 |
|
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 |
|
10 | 2230 |
/** Find a global type in given scope and load corresponding class. |
2231 |
* @param env The current environment. |
|
2232 |
* @param scope The scope in which to look for the type. |
|
2233 |
* @param name The type's name. |
|
2234 |
*/ |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2235 |
Symbol findGlobalType(Env<AttrContext> env, Scope scope, Name name, RecoveryLoadClass recoveryLoadClass) { |
10 | 2236 |
Symbol bestSoFar = typeNotFound; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2237 |
for (Symbol s : scope.getSymbolsByName(name)) { |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2238 |
Symbol sym = loadClass(env, s.flatName(), recoveryLoadClass); |
10 | 2239 |
if (bestSoFar.kind == TYP && sym.kind == TYP && |
2240 |
bestSoFar != sym) |
|
2241 |
return new AmbiguityError(bestSoFar, sym); |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2242 |
else |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2243 |
bestSoFar = bestOf(bestSoFar, sym); |
10 | 2244 |
} |
2245 |
return bestSoFar; |
|
2246 |
} |
|
2247 |
||
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2248 |
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
|
2249 |
for (Symbol sym : env.info.scope.getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2250 |
if (sym.kind == TYP) { |
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2251 |
if (staticOnly && |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2252 |
sym.type.hasTag(TYPEVAR) && |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2253 |
sym.owner.kind == TYP) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2254 |
return new StaticError(sym); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2255 |
return sym; |
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2256 |
} |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2257 |
} |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2258 |
return typeNotFound; |
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 |
|
10 | 2261 |
/** Find an unqualified type symbol. |
2262 |
* @param env The current environment. |
|
2263 |
* @param name The type's name. |
|
2264 |
*/ |
|
2265 |
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
|
2266 |
if (name == names.empty) |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29958
diff
changeset
|
2267 |
return typeNotFound; // do not allow inadvertent "lookup" of anonymous types |
10 | 2268 |
Symbol bestSoFar = typeNotFound; |
2269 |
Symbol sym; |
|
2270 |
boolean staticOnly = false; |
|
2271 |
for (Env<AttrContext> env1 = env; env1.outer != null; env1 = env1.outer) { |
|
2272 |
if (isStatic(env1)) staticOnly = true; |
|
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2273 |
// 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
|
2274 |
final Symbol tyvar = findTypeVar(env1, name, staticOnly); |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2275 |
sym = findImmediateMemberType(env1, env1.enclClass.sym.type, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2276 |
name, env1.enclClass.sym); |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2277 |
|
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2278 |
// 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
|
2279 |
// immediate member, OR the type variable is for a method. |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2280 |
if (tyvar != typeNotFound) { |
27386
784414cffd9a
8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents:
27224
diff
changeset
|
2281 |
if (env.baseClause || sym == typeNotFound || |
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2282 |
(tyvar.kind == TYP && tyvar.exists() && |
27386
784414cffd9a
8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents:
27224
diff
changeset
|
2283 |
tyvar.owner.kind == MTH)) { |
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2284 |
return tyvar; |
27386
784414cffd9a
8035259: javac, incorrect shadowing of classes vs type parameters
emc
parents:
27224
diff
changeset
|
2285 |
} |
10 | 2286 |
} |
2287 |
||
19652
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2288 |
// If the environment is a class def, finish up, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2289 |
// otherwise, do the entire findMemberType |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2290 |
if (sym == typeNotFound) |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2291 |
sym = findInheritedMemberType(env1, env1.enclClass.sym.type, |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2292 |
name, env1.enclClass.sym); |
1186c404a994
7118412: Shadowing of type-variables vs. member types
emc
parents:
19492
diff
changeset
|
2293 |
|
10 | 2294 |
if (staticOnly && sym.kind == TYP && |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
2295 |
sym.type.hasTag(CLASS) && |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
2296 |
sym.type.getEnclosingType().hasTag(CLASS) && |
10 | 2297 |
env1.enclClass.sym.type.isParameterized() && |
2298 |
sym.type.getEnclosingType().isParameterized()) |
|
2299 |
return new StaticError(sym); |
|
2300 |
else if (sym.exists()) return sym; |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2301 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2302 |
|
2303 |
JCClassDecl encl = env1.baseClause ? (JCClassDecl)env1.tree : env1.enclClass; |
|
2304 |
if ((encl.sym.flags() & STATIC) != 0) |
|
2305 |
staticOnly = true; |
|
2306 |
} |
|
2307 |
||
10950 | 2308 |
if (!env.tree.hasTag(IMPORT)) { |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2309 |
sym = findGlobalType(env, env.toplevel.namedImportScope, name, namedImportScopeRecovery); |
10 | 2310 |
if (sym.exists()) return sym; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2311 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2312 |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2313 |
sym = findGlobalType(env, env.toplevel.packge.members(), name, noRecovery); |
10 | 2314 |
if (sym.exists()) return sym; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2315 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2316 |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2317 |
sym = findGlobalType(env, env.toplevel.starImportScope, name, starImportScopeRecovery); |
10 | 2318 |
if (sym.exists()) return sym; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2319 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2320 |
} |
2321 |
||
2322 |
return bestSoFar; |
|
2323 |
} |
|
2324 |
||
2325 |
/** Find an unqualified identifier which matches a specified kind set. |
|
2326 |
* @param env The current environment. |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14446
diff
changeset
|
2327 |
* @param name The identifier's name. |
10 | 2328 |
* @param kind Indicates the possible symbol kinds |
2329 |
* (a subset of VAL, TYP, PCK). |
|
2330 |
*/ |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2331 |
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
|
2332 |
return checkVarType(findIdentInternal(env, name, kind), name); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2333 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2334 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2335 |
Symbol findIdentInternal(Env<AttrContext> env, Name name, KindSelector kind) { |
10 | 2336 |
Symbol bestSoFar = typeNotFound; |
2337 |
Symbol sym; |
|
2338 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2339 |
if (kind.contains(KindSelector.VAL)) { |
10 | 2340 |
sym = findVar(env, name); |
2341 |
if (sym.exists()) return sym; |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2342 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2343 |
} |
2344 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2345 |
if (kind.contains(KindSelector.TYP)) { |
10 | 2346 |
sym = findType(env, name); |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2347 |
|
10 | 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 | 2350 |
} |
2351 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2352 |
if (kind.contains(KindSelector.PCK)) |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2353 |
return lookupPackage(env, name); |
10 | 2354 |
else return bestSoFar; |
2355 |
} |
|
2356 |
||
2357 |
/** Find an identifier in a package which matches a specified kind set. |
|
2358 |
* @param env The current environment. |
|
2359 |
* @param name The identifier's name. |
|
2360 |
* @param kind Indicates the possible symbol kinds |
|
2361 |
* (a nonempty subset of TYP, PCK). |
|
2362 |
*/ |
|
2363 |
Symbol findIdentInPackage(Env<AttrContext> env, TypeSymbol pck, |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2364 |
Name name, KindSelector kind) { |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2365 |
return checkVarType(findIdentInPackageInternal(env, pck, name, kind), name); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2366 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2367 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2368 |
Symbol findIdentInPackageInternal(Env<AttrContext> env, TypeSymbol pck, |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2369 |
Name name, KindSelector kind) { |
10 | 2370 |
Name fullname = TypeSymbol.formFullName(name, pck); |
2371 |
Symbol bestSoFar = typeNotFound; |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2372 |
if (kind.contains(KindSelector.TYP)) { |
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2373 |
RecoveryLoadClass recoveryLoadClass = |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2374 |
allowModules && !kind.contains(KindSelector.PCK) && |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2375 |
!pck.exists() && !env.info.isSpeculative ? |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2376 |
doRecoveryLoadClass : noRecovery; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
2377 |
Symbol sym = loadClass(env, fullname, recoveryLoadClass); |
10 | 2378 |
if (sym.exists()) { |
2379 |
// don't allow programs to use flatnames |
|
2380 |
if (name == sym.name) return sym; |
|
2381 |
} |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2382 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2383 |
} |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2384 |
if (kind.contains(KindSelector.PCK)) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2385 |
return lookupPackage(env, fullname); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2386 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
2387 |
return bestSoFar; |
10 | 2388 |
} |
2389 |
||
2390 |
/** Find an identifier among the members of a given type `site'. |
|
2391 |
* @param env The current environment. |
|
2392 |
* @param site The type containing the symbol to be found. |
|
2393 |
* @param name The identifier's name. |
|
2394 |
* @param kind Indicates the possible symbol kinds |
|
2395 |
* (a subset of VAL, TYP). |
|
2396 |
*/ |
|
2397 |
Symbol findIdentInType(Env<AttrContext> env, Type site, |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2398 |
Name name, KindSelector kind) { |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2399 |
return checkVarType(findIdentInTypeInternal(env, site, name, kind), name); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2400 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2401 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2402 |
Symbol findIdentInTypeInternal(Env<AttrContext> env, Type site, |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2403 |
Name name, KindSelector kind) { |
10 | 2404 |
Symbol bestSoFar = typeNotFound; |
2405 |
Symbol sym; |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2406 |
if (kind.contains(KindSelector.VAL)) { |
10 | 2407 |
sym = findField(env, site, name, site.tsym); |
2408 |
if (sym.exists()) return sym; |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2409 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2410 |
} |
2411 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2412 |
if (kind.contains(KindSelector.TYP)) { |
10 | 2413 |
sym = findMemberType(env, site, name, site.tsym); |
2414 |
if (sym.exists()) return sym; |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2415 |
else bestSoFar = bestOf(bestSoFar, sym); |
10 | 2416 |
} |
2417 |
return bestSoFar; |
|
2418 |
} |
|
2419 |
||
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2420 |
private Symbol checkVarType(Symbol bestSoFar, Name name) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2421 |
if (allowLocalVariableTypeInference && name.equals(names.var) && |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2422 |
(bestSoFar.kind == TYP || bestSoFar.kind == ABSENT_TYP)) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2423 |
bestSoFar = new BadVarTypeError(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2424 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2425 |
return bestSoFar; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2426 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
2427 |
|
10 | 2428 |
/* *************************************************************************** |
2429 |
* Access checking |
|
2430 |
* The following methods convert ResolveErrors to ErrorSymbols, issuing |
|
2431 |
* an error message in the process |
|
2432 |
****************************************************************************/ |
|
2433 |
||
2434 |
/** If `sym' is a bad symbol: report error and return errSymbol |
|
2435 |
* else pass through unchanged, |
|
2436 |
* additional arguments duplicate what has been used in trying to find the |
|
13844 | 2437 |
* symbol {@literal (--> flyweight pattern)}. This improves performance since we |
10 | 2438 |
* expect misses to happen frequently. |
2439 |
* |
|
2440 |
* @param sym The symbol that was found, or a ResolveError. |
|
2441 |
* @param pos The position to use for error reporting. |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2442 |
* @param location The symbol the served as a context for this lookup |
10 | 2443 |
* @param site The original type from where the selection took place. |
2444 |
* @param name The symbol's name. |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2445 |
* @param qualified Did we get here through a qualified expression resolution? |
10 | 2446 |
* @param argtypes The invocation's value arguments, |
2447 |
* if we looked for a method. |
|
2448 |
* @param typeargtypes The invocation's type arguments, |
|
2449 |
* if we looked for a method. |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2450 |
* @param logResolveHelper helper class used to log resolve errors |
10 | 2451 |
*/ |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2452 |
Symbol accessInternal(Symbol sym, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2453 |
DiagnosticPosition pos, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2454 |
Symbol location, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2455 |
Type site, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2456 |
Name name, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2457 |
boolean qualified, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2458 |
List<Type> argtypes, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2459 |
List<Type> typeargtypes, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2460 |
LogResolveHelper logResolveHelper) { |
29774
9d438163db79
8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents:
29554
diff
changeset
|
2461 |
if (sym.kind.isResolutionError()) { |
24400
f05df7f58567
8037379: fix for JDK-8029569 doesn't cover all possible cases
vromero
parents:
24396
diff
changeset
|
2462 |
ResolveError errSym = (ResolveError)sym.baseSymbol(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2463 |
sym = errSym.access(name, qualified ? site.tsym : syms.noSymbol); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2464 |
argtypes = logResolveHelper.getArgumentTypes(errSym, sym, name, argtypes); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2465 |
if (logResolveHelper.resolveDiagnosticNeeded(site, argtypes, typeargtypes)) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2466 |
logResolveError(errSym, pos, location, site, name, argtypes, typeargtypes); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2467 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2468 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2469 |
return sym; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2470 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2471 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2472 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2473 |
* 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
|
2474 |
* resolution diagnostics |
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 |
Symbol accessMethod(Symbol sym, |
10 | 2477 |
DiagnosticPosition pos, |
8045 | 2478 |
Symbol location, |
10 | 2479 |
Type site, |
2480 |
Name name, |
|
2481 |
boolean qualified, |
|
2482 |
List<Type> argtypes, |
|
2483 |
List<Type> typeargtypes) { |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2484 |
return accessInternal(sym, pos, location, site, name, qualified, argtypes, typeargtypes, methodLogResolveHelper); |
10 | 2485 |
} |
2486 |
||
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2487 |
/** Same as original accessMethod(), but without location. |
8045 | 2488 |
*/ |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2489 |
Symbol accessMethod(Symbol sym, |
8045 | 2490 |
DiagnosticPosition pos, |
2491 |
Type site, |
|
2492 |
Name name, |
|
2493 |
boolean qualified, |
|
2494 |
List<Type> argtypes, |
|
2495 |
List<Type> typeargtypes) { |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2496 |
return accessMethod(sym, pos, site.tsym, site, name, qualified, argtypes, typeargtypes); |
8045 | 2497 |
} |
2498 |
||
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2499 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2500 |
* 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
|
2501 |
* type resolution diagnostics |
8045 | 2502 |
*/ |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2503 |
Symbol accessBase(Symbol sym, |
8045 | 2504 |
DiagnosticPosition pos, |
2505 |
Symbol location, |
|
2506 |
Type site, |
|
2507 |
Name name, |
|
2508 |
boolean qualified) { |
|
42828
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
42827
diff
changeset
|
2509 |
return accessInternal(sym, pos, location, site, name, qualified, List.nil(), null, basicLogResolveHelper); |
8045 | 2510 |
} |
2511 |
||
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2512 |
/** Same as original accessBase(), but without location. |
10 | 2513 |
*/ |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2514 |
Symbol accessBase(Symbol sym, |
10 | 2515 |
DiagnosticPosition pos, |
2516 |
Type site, |
|
2517 |
Name name, |
|
2518 |
boolean qualified) { |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2519 |
return accessBase(sym, pos, site.tsym, site, name, qualified); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2520 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2521 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2522 |
interface LogResolveHelper { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2523 |
boolean resolveDiagnosticNeeded(Type site, List<Type> argtypes, List<Type> typeargtypes); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2524 |
List<Type> getArgumentTypes(ResolveError errSym, Symbol accessedSym, Name name, List<Type> argtypes); |
10 | 2525 |
} |
2526 |
||
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2527 |
LogResolveHelper basicLogResolveHelper = new LogResolveHelper() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2528 |
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
|
2529 |
return !site.isErroneous(); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2530 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2531 |
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
|
2532 |
return argtypes; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2533 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2534 |
}; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2535 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2536 |
LogResolveHelper methodLogResolveHelper = new LogResolveHelper() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2537 |
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
|
2538 |
return !site.isErroneous() && |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2539 |
!Type.isErroneous(argtypes) && |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2540 |
(typeargtypes == null || !Type.isErroneous(typeargtypes)); |
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 |
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
|
2543 |
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
|
2544 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2545 |
}; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2546 |
|
19914 | 2547 |
class ResolveDeferredRecoveryMap extends DeferredAttr.RecoveryDeferredTypeMap { |
2548 |
||
2549 |
public ResolveDeferredRecoveryMap(AttrMode mode, Symbol msym, MethodResolutionPhase step) { |
|
2550 |
deferredAttr.super(mode, msym, step); |
|
2551 |
} |
|
2552 |
||
2553 |
@Override |
|
2554 |
protected Type typeOf(DeferredType dt) { |
|
2555 |
Type res = super.typeOf(dt); |
|
2556 |
if (!res.isErroneous()) { |
|
2557 |
switch (TreeInfo.skipParens(dt.tree).getTag()) { |
|
2558 |
case LAMBDA: |
|
2559 |
case REFERENCE: |
|
2560 |
return dt; |
|
2561 |
case CONDEXPR: |
|
2562 |
return res == Type.recoveryType ? |
|
2563 |
dt : res; |
|
2564 |
} |
|
2565 |
} |
|
2566 |
return res; |
|
2567 |
} |
|
2568 |
} |
|
2569 |
||
10 | 2570 |
/** Check that sym is not an abstract method. |
2571 |
*/ |
|
2572 |
void checkNonAbstract(DiagnosticPosition pos, Symbol sym) { |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
2573 |
if ((sym.flags() & ABSTRACT) != 0 && (sym.flags() & DEFAULT) == 0) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
2574 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
2575 |
Errors.AbstractCantBeAccessedDirectly(kindName(sym),sym, sym.location())); |
10 | 2576 |
} |
2577 |
||
2578 |
/* *************************************************************************** |
|
2579 |
* Name resolution |
|
2580 |
* Naming conventions are as for symbol lookup |
|
2581 |
* Unlike the find... methods these methods will report access errors |
|
2582 |
****************************************************************************/ |
|
2583 |
||
2584 |
/** Resolve an unqualified (non-method) identifier. |
|
2585 |
* @param pos The position to use for error reporting. |
|
2586 |
* @param env The environment current at the identifier use. |
|
2587 |
* @param name The identifier's name. |
|
2588 |
* @param kind The set of admissible symbol kinds for the identifier. |
|
2589 |
*/ |
|
2590 |
Symbol resolveIdent(DiagnosticPosition pos, Env<AttrContext> env, |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2591 |
Name name, KindSelector kind) { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2592 |
return accessBase( |
10 | 2593 |
findIdent(env, name, kind), |
2594 |
pos, env.enclClass.sym.type, name, false); |
|
2595 |
} |
|
2596 |
||
2597 |
/** Resolve an unqualified method identifier. |
|
2598 |
* @param pos The position to use for error reporting. |
|
2599 |
* @param env The environment current at the method invocation. |
|
2600 |
* @param name The identifier's name. |
|
2601 |
* @param argtypes The types of the invocation's value arguments. |
|
2602 |
* @param typeargtypes The types of the invocation's type arguments. |
|
2603 |
*/ |
|
2604 |
Symbol resolveMethod(DiagnosticPosition pos, |
|
2605 |
Env<AttrContext> env, |
|
2606 |
Name name, |
|
2607 |
List<Type> argtypes, |
|
2608 |
List<Type> typeargtypes) { |
|
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2609 |
return lookupMethod(env, pos, env.enclClass.sym, resolveMethodCheck, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2610 |
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
|
2611 |
@Override |
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
2612 |
Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2613 |
return findFun(env, name, argtypes, typeargtypes, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2614 |
phase.isBoxingRequired(), |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2615 |
phase.isVarargsRequired()); |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2616 |
}}); |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
2617 |
} |
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
2618 |
|
10 | 2619 |
/** Resolve a qualified method identifier |
2620 |
* @param pos The position to use for error reporting. |
|
2621 |
* @param env The environment current at the method invocation. |
|
2622 |
* @param site The type of the qualifying expression, in which |
|
2623 |
* identifier is searched. |
|
2624 |
* @param name The identifier's name. |
|
2625 |
* @param argtypes The types of the invocation's value arguments. |
|
2626 |
* @param typeargtypes The types of the invocation's type arguments. |
|
2627 |
*/ |
|
2628 |
Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env, |
|
2629 |
Type site, Name name, List<Type> argtypes, |
|
2630 |
List<Type> typeargtypes) { |
|
8045 | 2631 |
return resolveQualifiedMethod(pos, env, site.tsym, site, name, argtypes, typeargtypes); |
2632 |
} |
|
2633 |
Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env, |
|
2634 |
Symbol location, Type site, Name name, List<Type> argtypes, |
|
2635 |
List<Type> typeargtypes) { |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2636 |
return resolveQualifiedMethod(new MethodResolutionContext(), pos, env, location, site, name, argtypes, typeargtypes); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2637 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2638 |
private Symbol resolveQualifiedMethod(MethodResolutionContext resolveContext, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2639 |
DiagnosticPosition pos, Env<AttrContext> env, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2640 |
Symbol location, Type site, Name name, List<Type> argtypes, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2641 |
List<Type> typeargtypes) { |
14444 | 2642 |
return lookupMethod(env, pos, location, resolveContext, new BasicLookupHelper(name, site, argtypes, typeargtypes) { |
2643 |
@Override |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
2644 |
Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
14444 | 2645 |
return findMethod(env, site, name, argtypes, typeargtypes, |
2646 |
phase.isBoxingRequired(), |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
2647 |
phase.isVarargsRequired()); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2648 |
} |
14444 | 2649 |
@Override |
2650 |
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
|
2651 |
if (sym.kind.isResolutionError()) { |
14444 | 2652 |
sym = super.access(env, pos, location, sym); |
2653 |
} else if (allowMethodHandles) { |
|
2654 |
MethodSymbol msym = (MethodSymbol)sym; |
|
18389
a425d0819f36
8016569: javac, add new flag for polymorphic method signatures
vromero
parents:
18378
diff
changeset
|
2655 |
if ((msym.flags() & SIGNATURE_POLYMORPHIC) != 0) { |
14444 | 2656 |
return findPolymorphicSignatureInstance(env, sym, argtypes); |
2657 |
} |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2658 |
} |
14444 | 2659 |
return sym; |
6592
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
2660 |
} |
14444 | 2661 |
}); |
10 | 2662 |
} |
2663 |
||
6592
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
2664 |
/** 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
|
2665 |
* 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
|
2666 |
* 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
|
2667 |
* @param env Attribution environment |
12335
4725d88691dd
7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents:
12334
diff
changeset
|
2668 |
* @param spMethod signature polymorphic method - i.e. MH.invokeExact |
4725d88691dd
7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents:
12334
diff
changeset
|
2669 |
* @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
|
2670 |
*/ |
12335
4725d88691dd
7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents:
12334
diff
changeset
|
2671 |
Symbol findPolymorphicSignatureInstance(Env<AttrContext> env, |
14547 | 2672 |
final Symbol spMethod, |
8036
17b976649c61
6992698: JSR 292: remove support for transient syntax in polymorphic signature calls
mcimadamore
parents:
8032
diff
changeset
|
2673 |
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
|
2674 |
Type mtype = infer.instantiatePolymorphicSignatureInstance(env, |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
2675 |
(MethodSymbol)spMethod, currentResolutionContext, argtypes); |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2676 |
for (Symbol sym : polymorphicSignatureScope.getSymbolsByName(spMethod.name)) { |
36995 | 2677 |
// Check that there is already a method symbol for the method |
2678 |
// type and owner |
|
2679 |
if (types.isSameType(mtype, sym.type) && |
|
2680 |
spMethod.owner == sym.owner) { |
|
2681 |
return sym; |
|
6592
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
2682 |
} |
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
2683 |
} |
12335
4725d88691dd
7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents:
12334
diff
changeset
|
2684 |
|
36995 | 2685 |
// Create the desired method |
2686 |
// Retain static modifier is to support invocations to |
|
2687 |
// MethodHandle.linkTo* methods |
|
2688 |
long flags = ABSTRACT | HYPOTHETICAL | |
|
2689 |
spMethod.flags() & (Flags.AccessFlags | Flags.STATIC); |
|
14547 | 2690 |
Symbol msym = new MethodSymbol(flags, spMethod.name, mtype, spMethod.owner) { |
2691 |
@Override |
|
2692 |
public Symbol baseSymbol() { |
|
2693 |
return spMethod; |
|
2694 |
} |
|
2695 |
}; |
|
32949
7e0f345e64a8
8130506: javac AssertionError when invoking MethodHandle.invoke with lambda paramter
sadayapalam
parents:
32709
diff
changeset
|
2696 |
if (!mtype.isErroneous()) { // Cache only if kosher. |
7e0f345e64a8
8130506: javac AssertionError when invoking MethodHandle.invoke with lambda paramter
sadayapalam
parents:
32709
diff
changeset
|
2697 |
polymorphicSignatureScope.enter(msym); |
7e0f345e64a8
8130506: javac AssertionError when invoking MethodHandle.invoke with lambda paramter
sadayapalam
parents:
32709
diff
changeset
|
2698 |
} |
12335
4725d88691dd
7133185: Update 292 overload resolution logic to match JLS
mcimadamore
parents:
12334
diff
changeset
|
2699 |
return msym; |
6592
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
2700 |
} |
dc56420a69bc
6979327: method handle invocation should use casts instead of type parameters to specify return type
mcimadamore
parents:
6356
diff
changeset
|
2701 |
|
10 | 2702 |
/** Resolve a qualified method identifier, throw a fatal error if not |
2703 |
* found. |
|
2704 |
* @param pos The position to use for error reporting. |
|
2705 |
* @param env The environment current at the method invocation. |
|
2706 |
* @param site The type of the qualifying expression, in which |
|
2707 |
* identifier is searched. |
|
2708 |
* @param name The identifier's name. |
|
2709 |
* @param argtypes The types of the invocation's value arguments. |
|
2710 |
* @param typeargtypes The types of the invocation's type arguments. |
|
2711 |
*/ |
|
2712 |
public MethodSymbol resolveInternalMethod(DiagnosticPosition pos, Env<AttrContext> env, |
|
2713 |
Type site, Name name, |
|
2714 |
List<Type> argtypes, |
|
2715 |
List<Type> typeargtypes) { |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2716 |
MethodResolutionContext resolveContext = new MethodResolutionContext(); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2717 |
resolveContext.internalResolution = true; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2718 |
Symbol sym = resolveQualifiedMethod(resolveContext, pos, env, site.tsym, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2719 |
site, name, argtypes, typeargtypes); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2720 |
if (sym.kind == MTH) return (MethodSymbol)sym; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2721 |
else throw new FatalError( |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
2722 |
diags.fragment(Fragments.FatalErrCantLocateMeth(name))); |
10 | 2723 |
} |
2724 |
||
2725 |
/** Resolve constructor. |
|
2726 |
* @param pos The position to use for error reporting. |
|
2727 |
* @param env The environment current at the constructor invocation. |
|
2728 |
* @param site The type of class for which a constructor is searched. |
|
2729 |
* @param argtypes The types of the constructor invocation's value |
|
2730 |
* arguments. |
|
2731 |
* @param typeargtypes The types of the constructor invocation's type |
|
2732 |
* arguments. |
|
2733 |
*/ |
|
2734 |
Symbol resolveConstructor(DiagnosticPosition pos, |
|
2735 |
Env<AttrContext> env, |
|
2736 |
Type site, |
|
2737 |
List<Type> argtypes, |
|
2738 |
List<Type> typeargtypes) { |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2739 |
return resolveConstructor(new MethodResolutionContext(), pos, env, site, argtypes, typeargtypes); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2740 |
} |
14444 | 2741 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2742 |
private Symbol resolveConstructor(MethodResolutionContext resolveContext, |
14444 | 2743 |
final DiagnosticPosition pos, |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2744 |
Env<AttrContext> env, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2745 |
Type site, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2746 |
List<Type> argtypes, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2747 |
List<Type> typeargtypes) { |
14444 | 2748 |
return lookupMethod(env, pos, site.tsym, resolveContext, new BasicLookupHelper(names.init, site, argtypes, typeargtypes) { |
2749 |
@Override |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
2750 |
Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
14444 | 2751 |
return findConstructor(pos, env, site, argtypes, typeargtypes, |
2752 |
phase.isBoxingRequired(), |
|
2753 |
phase.isVarargsRequired()); |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
2754 |
} |
14444 | 2755 |
}); |
2756 |
} |
|
2757 |
||
2758 |
/** Resolve a constructor, throw a fatal error if not found. |
|
2759 |
* @param pos The position to use for error reporting. |
|
2760 |
* @param env The environment current at the method invocation. |
|
2761 |
* @param site The type to be constructed. |
|
2762 |
* @param argtypes The types of the invocation's value arguments. |
|
2763 |
* @param typeargtypes The types of the invocation's type arguments. |
|
2764 |
*/ |
|
2765 |
public MethodSymbol resolveInternalConstructor(DiagnosticPosition pos, Env<AttrContext> env, |
|
2766 |
Type site, |
|
2767 |
List<Type> argtypes, |
|
2768 |
List<Type> typeargtypes) { |
|
2769 |
MethodResolutionContext resolveContext = new MethodResolutionContext(); |
|
2770 |
resolveContext.internalResolution = true; |
|
2771 |
Symbol sym = resolveConstructor(resolveContext, pos, env, site, argtypes, typeargtypes); |
|
2772 |
if (sym.kind == MTH) return (MethodSymbol)sym; |
|
2773 |
else throw new FatalError( |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
2774 |
diags.fragment(Fragments.FatalErrCantLocateCtor(site))); |
14444 | 2775 |
} |
2776 |
||
2777 |
Symbol findConstructor(DiagnosticPosition pos, Env<AttrContext> env, |
|
2778 |
Type site, List<Type> argtypes, |
|
2779 |
List<Type> typeargtypes, |
|
2780 |
boolean allowBoxing, |
|
2781 |
boolean useVarargs) { |
|
2782 |
Symbol sym = findMethod(env, site, |
|
2783 |
names.init, argtypes, |
|
2784 |
typeargtypes, allowBoxing, |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
2785 |
useVarargs); |
14444 | 2786 |
chk.checkDeprecated(pos, env.info.scope.owner, sym); |
2787 |
return sym; |
|
10 | 2788 |
} |
2789 |
||
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2790 |
/** Resolve constructor using diamond inference. |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2791 |
* @param pos The position to use for error reporting. |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2792 |
* @param env The environment current at the constructor invocation. |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2793 |
* @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
|
2794 |
* The scope of this class has been touched in attribution. |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2795 |
* @param argtypes The types of the constructor invocation's value |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2796 |
* arguments. |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2797 |
* @param typeargtypes The types of the constructor invocation's type |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2798 |
* arguments. |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2799 |
*/ |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2800 |
Symbol resolveDiamond(DiagnosticPosition pos, |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2801 |
Env<AttrContext> env, |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2802 |
Type site, |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2803 |
List<Type> argtypes, |
6344
f190fb7fdd2d
6975275: diamond implementation needs some cleanup
mcimadamore
parents:
6151
diff
changeset
|
2804 |
List<Type> typeargtypes) { |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2805 |
return lookupMethod(env, pos, site.tsym, resolveMethodCheck, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2806 |
new BasicLookupHelper(names.init, site, argtypes, typeargtypes) { |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2807 |
@Override |
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
2808 |
Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2809 |
return findDiamond(env, site, argtypes, typeargtypes, |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2810 |
phase.isBoxingRequired(), |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2811 |
phase.isVarargsRequired()); |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2812 |
} |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2813 |
@Override |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2814 |
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
|
2815 |
if (sym.kind.isResolutionError()) { |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2816 |
if (sym.kind != WRONG_MTH && |
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
2817 |
sym.kind != WRONG_MTHS) { |
19917
ebb957ba7b07
8023545: Misleading error message when using diamond operator with private constructor
vromero
parents:
19914
diff
changeset
|
2818 |
sym = super.access(env, pos, location, sym); |
ebb957ba7b07
8023545: Misleading error message when using diamond operator with private constructor
vromero
parents:
19914
diff
changeset
|
2819 |
} else { |
ebb957ba7b07
8023545: Misleading error message when using diamond operator with private constructor
vromero
parents:
19914
diff
changeset
|
2820 |
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
|
2821 |
((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd : |
19917
ebb957ba7b07
8023545: Misleading error message when using diamond operator with private constructor
vromero
parents:
19914
diff
changeset
|
2822 |
null; |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
2823 |
sym = new DiamondError(sym, currentResolutionContext); |
19917
ebb957ba7b07
8023545: Misleading error message when using diamond operator with private constructor
vromero
parents:
19914
diff
changeset
|
2824 |
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
|
2825 |
env.info.pendingResolutionPhase = currentResolutionContext.step; |
ebb957ba7b07
8023545: Misleading error message when using diamond operator with private constructor
vromero
parents:
19914
diff
changeset
|
2826 |
} |
14444 | 2827 |
} |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2828 |
return sym; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
2829 |
}}); |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2830 |
} |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
3372
diff
changeset
|
2831 |
|
12078
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2832 |
/** 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
|
2833 |
* assuming that the original scope contains a constructor of the kind: |
13844 | 2834 |
* {@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
|
2835 |
* a method check is executed against the modified constructor type: |
13844 | 2836 |
* {@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
|
2837 |
* 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
|
2838 |
* the inferred type for the diamond operator. |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2839 |
*/ |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2840 |
private Symbol findDiamond(Env<AttrContext> env, |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2841 |
Type site, |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2842 |
List<Type> argtypes, |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2843 |
List<Type> typeargtypes, |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2844 |
boolean allowBoxing, |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2845 |
boolean useVarargs) { |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2846 |
Symbol bestSoFar = methodNotFound; |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29774
diff
changeset
|
2847 |
TypeSymbol tsym = site.tsym.isInterface() ? syms.objectType.tsym : site.tsym; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29774
diff
changeset
|
2848 |
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
|
2849 |
//- System.out.println(" e " + e.sym); |
14051
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2850 |
if (sym.kind == MTH && |
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2851 |
(sym.flags_field & SYNTHETIC) == 0) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
2852 |
List<Type> oldParams = sym.type.hasTag(FORALL) ? |
14051
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2853 |
((ForAll)sym.type).tvars : |
42828
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
42827
diff
changeset
|
2854 |
List.nil(); |
12078
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2855 |
Type constrType = new ForAll(site.tsym.type.getTypeArguments().appendList(oldParams), |
24396 | 2856 |
types.createMethodTypeWithReturn(sym.type.asMethodType(), site)); |
14051
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2857 |
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
|
2858 |
@Override |
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2859 |
public Symbol baseSymbol() { |
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2860 |
return sym; |
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2861 |
} |
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2862 |
}; |
12078
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2863 |
bestSoFar = selectBest(env, site, argtypes, typeargtypes, |
14051
9097cec96212
7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents:
14048
diff
changeset
|
2864 |
newConstr, |
12078
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2865 |
bestSoFar, |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2866 |
allowBoxing, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
2867 |
useVarargs); |
12078
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2868 |
} |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2869 |
} |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2870 |
return bestSoFar; |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2871 |
} |
7470e05d486b
7148164: attribution code for diamond should not rely on mutable state
mcimadamore
parents:
12076
diff
changeset
|
2872 |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2873 |
Symbol getMemberReference(DiagnosticPosition pos, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2874 |
Env<AttrContext> env, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2875 |
JCMemberReference referenceTree, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2876 |
Type site, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2877 |
Name name) { |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2878 |
|
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2879 |
site = types.capture(site); |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2880 |
|
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2881 |
ReferenceLookupHelper lookupHelper = makeReferenceLookupHelper( |
42828
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
42827
diff
changeset
|
2882 |
referenceTree, site, name, List.nil(), null, VARARITY); |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2883 |
|
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2884 |
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
|
2885 |
Symbol sym = lookupMethod(newEnv, env.tree.pos(), site.tsym, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2886 |
nilMethodCheck, lookupHelper); |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2887 |
|
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2888 |
env.info.pendingResolutionPhase = newEnv.info.pendingResolutionPhase; |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2889 |
|
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2890 |
return sym; |
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 |
|
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2893 |
ReferenceLookupHelper makeReferenceLookupHelper(JCMemberReference referenceTree, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2894 |
Type site, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2895 |
Name name, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2896 |
List<Type> argtypes, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2897 |
List<Type> typeargtypes, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2898 |
MethodResolutionPhase maxPhase) { |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2899 |
if (!name.equals(names.init)) { |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2900 |
//method reference |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2901 |
return new MethodReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2902 |
} else if (site.hasTag(ARRAY)) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2903 |
//array constructor reference |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2904 |
return new ArrayConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase); |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2905 |
} else { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2906 |
//class constructor reference |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2907 |
return new ConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase); |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2908 |
} |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2909 |
} |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2910 |
|
10 | 2911 |
/** |
14444 | 2912 |
* Resolution of member references is typically done as a single |
2913 |
* overload resolution step, where the argument types A are inferred from |
|
2914 |
* the target functional descriptor. |
|
2915 |
* |
|
2916 |
* If the member reference is a method reference with a type qualifier, |
|
2917 |
* a two-step lookup process is performed. The first step uses the |
|
2918 |
* expected argument list A, while the second step discards the first |
|
2919 |
* type from A (which is treated as a receiver type). |
|
2920 |
* |
|
2921 |
* There are two cases in which inference is performed: (i) if the member |
|
2922 |
* reference is a constructor reference and the qualifier type is raw - in |
|
2923 |
* which case diamond inference is used to infer a parameterization for the |
|
2924 |
* type qualifier; (ii) if the member reference is an unbound reference |
|
2925 |
* where the type qualifier is raw - in that case, during the unbound lookup |
|
2926 |
* the receiver argument type is used to infer an instantiation for the raw |
|
2927 |
* qualifier type. |
|
2928 |
* |
|
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2929 |
* When a multi-step resolution process is exploited, the process of picking |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2930 |
* the resulting symbol is delegated to an helper class {@link com.sun.tools.javac.comp.Resolve.ReferenceChooser}. |
14444 | 2931 |
* |
2932 |
* This routine returns a pair (T,S), where S is the member reference symbol, |
|
2933 |
* and T is the type of the class in which S is defined. This is necessary as |
|
2934 |
* the type T might be dynamically inferred (i.e. if constructor reference |
|
2935 |
* has a raw qualifier). |
|
2936 |
*/ |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2937 |
Pair<Symbol, ReferenceLookupHelper> resolveMemberReference(Env<AttrContext> env, |
14444 | 2938 |
JCMemberReference referenceTree, |
2939 |
Type site, |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2940 |
Name name, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2941 |
List<Type> argtypes, |
14444 | 2942 |
List<Type> typeargtypes, |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
2943 |
MethodCheck methodCheck, |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2944 |
InferenceContext inferenceContext, |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2945 |
ReferenceChooser referenceChooser) { |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
2946 |
|
29292
c10d63c667cd
8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents:
29146
diff
changeset
|
2947 |
//step 1 - bound lookup |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2948 |
ReferenceLookupHelper boundLookupHelper = makeReferenceLookupHelper( |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2949 |
referenceTree, site, name, argtypes, typeargtypes, VARARITY); |
14444 | 2950 |
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
|
2951 |
MethodResolutionContext boundSearchResolveContext = new MethodResolutionContext(); |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2952 |
boundSearchResolveContext.methodCheck = methodCheck; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2953 |
Symbol boundSym = lookupMethod(boundEnv, env.tree.pos(), |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2954 |
site.tsym, boundSearchResolveContext, boundLookupHelper); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2955 |
ReferenceLookupResult boundRes = new ReferenceLookupResult(boundSym, boundSearchResolveContext); |
14444 | 2956 |
|
2957 |
//step 2 - unbound lookup |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2958 |
Symbol unboundSym = methodNotFound; |
14444 | 2959 |
Env<AttrContext> unboundEnv = env.dup(env.tree, env.info.dup()); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2960 |
ReferenceLookupHelper unboundLookupHelper = boundLookupHelper.unboundLookup(inferenceContext); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2961 |
ReferenceLookupResult unboundRes = referenceNotFound; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2962 |
if (unboundLookupHelper != null) { |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2963 |
MethodResolutionContext unboundSearchResolveContext = |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2964 |
new MethodResolutionContext(); |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2965 |
unboundSearchResolveContext.methodCheck = methodCheck; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2966 |
unboundSym = lookupMethod(unboundEnv, env.tree.pos(), |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2967 |
site.tsym, unboundSearchResolveContext, unboundLookupHelper); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2968 |
unboundRes = new ReferenceLookupResult(unboundSym, unboundSearchResolveContext); |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2969 |
} |
14444 | 2970 |
|
2971 |
//merge results |
|
2972 |
Pair<Symbol, ReferenceLookupHelper> res; |
|
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
2973 |
ReferenceLookupResult bestRes = referenceChooser.result(boundRes, unboundRes); |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
2974 |
res = new Pair<>(bestRes.sym, |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
2975 |
bestRes == unboundRes ? unboundLookupHelper : boundLookupHelper); |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
2976 |
env.info.pendingResolutionPhase = bestRes == unboundRes ? |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
2977 |
unboundEnv.info.pendingResolutionPhase : |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
2978 |
boundEnv.info.pendingResolutionPhase; |
14444 | 2979 |
|
2980 |
return res; |
|
2981 |
} |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
2982 |
|
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2983 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2984 |
* 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
|
2985 |
* 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
|
2986 |
* 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
|
2987 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2988 |
static class ReferenceLookupResult { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2989 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2990 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2991 |
* 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
|
2992 |
* 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
|
2993 |
* depending on whether all applicable candidates are static or non-static methods, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2994 |
* 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
|
2995 |
* its kind is set to BOTH. |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2996 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2997 |
enum StaticKind { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2998 |
STATIC, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
2999 |
NON_STATIC, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3000 |
BOTH, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3001 |
UNDEFINED; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3002 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3003 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3004 |
* Retrieve the static kind associated with a given (method) symbol. |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3005 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3006 |
static StaticKind from(Symbol s) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3007 |
return s.isStatic() ? |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3008 |
STATIC : NON_STATIC; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3009 |
} |
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 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3012 |
* Merge two static kinds together. |
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 StaticKind reduce(StaticKind sk1, StaticKind sk2) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3015 |
if (sk1 == UNDEFINED) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3016 |
return sk2; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3017 |
} else if (sk2 == UNDEFINED) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3018 |
return sk1; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3019 |
} else { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3020 |
return sk1 == sk2 ? sk1 : BOTH; |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3021 |
} |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3022 |
} |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3023 |
} |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3024 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3025 |
/** The static kind. */ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3026 |
StaticKind staticKind; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3027 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3028 |
/** The lookup result. */ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3029 |
Symbol sym; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3030 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3031 |
ReferenceLookupResult(Symbol sym, MethodResolutionContext resolutionContext) { |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3032 |
this(sym, staticKind(sym, resolutionContext)); |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3033 |
} |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3034 |
|
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3035 |
private ReferenceLookupResult(Symbol sym, StaticKind staticKind) { |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3036 |
this.staticKind = staticKind; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3037 |
this.sym = sym; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3038 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3039 |
|
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3040 |
private static StaticKind staticKind(Symbol sym, MethodResolutionContext resolutionContext) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3041 |
switch (sym.kind) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3042 |
case MTH: |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3043 |
case AMBIGUOUS: |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3044 |
return resolutionContext.candidates.stream() |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3045 |
.filter(c -> c.isApplicable() && c.step == resolutionContext.step) |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3046 |
.map(c -> StaticKind.from(c.sym)) |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3047 |
.reduce(StaticKind::reduce) |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3048 |
.orElse(StaticKind.UNDEFINED); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3049 |
default: |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3050 |
return StaticKind.UNDEFINED; |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3051 |
} |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3052 |
} |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3053 |
|
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3054 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3055 |
* 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
|
3056 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3057 |
boolean isSuccess() { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3058 |
return staticKind != StaticKind.UNDEFINED; |
16294
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15706
diff
changeset
|
3059 |
} |
14444 | 3060 |
|
28456
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 |
* Does this result have given static kind? |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3063 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3064 |
boolean hasKind(StaticKind sk) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3065 |
return this.staticKind == sk; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3066 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3067 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3068 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3069 |
* 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
|
3070 |
* some 'better' result) ? |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3071 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3072 |
boolean canIgnore() { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3073 |
switch (sym.kind) { |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3074 |
case ABSENT_MTH: |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3075 |
return true; |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3076 |
case WRONG_MTH: |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3077 |
InapplicableSymbolError errSym = |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3078 |
(InapplicableSymbolError)sym.baseSymbol(); |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3079 |
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
|
3080 |
.matches(errSym.errCandidate().snd); |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3081 |
case WRONG_MTHS: |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3082 |
InapplicableSymbolsError errSyms = |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3083 |
(InapplicableSymbolsError)sym.baseSymbol(); |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3084 |
return errSyms.filterCandidates(errSyms.mapCandidates()).isEmpty(); |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3085 |
default: |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3086 |
return false; |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3087 |
} |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3088 |
} |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3089 |
|
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3090 |
static ReferenceLookupResult error(Symbol sym) { |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3091 |
return new ReferenceLookupResult(sym, StaticKind.UNDEFINED); |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3092 |
} |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3093 |
} |
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 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3096 |
* 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
|
3097 |
* {@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
|
3098 |
* result of method reference resolution. |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3099 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3100 |
abstract class ReferenceChooser { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3101 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3102 |
* 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
|
3103 |
* appropriate result generation routine. |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3104 |
*/ |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3105 |
ReferenceLookupResult result(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3106 |
return unboundRes != referenceNotFound ? |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3107 |
unboundResult(boundRes, unboundRes) : |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3108 |
boundResult(boundRes); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3109 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3110 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3111 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3112 |
* Generate a symbol from a given bound lookup result. |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3113 |
*/ |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3114 |
abstract ReferenceLookupResult boundResult(ReferenceLookupResult boundRes); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3115 |
|
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 |
* Generate a symbol from a pair of bound/unbound lookup results. |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3118 |
*/ |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3119 |
abstract ReferenceLookupResult unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3120 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3121 |
|
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 |
* 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
|
3124 |
* is described in JLS SE 8 (15.3.2). |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3125 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3126 |
ReferenceChooser basicReferenceChooser = new ReferenceChooser() { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3127 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3128 |
@Override |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3129 |
ReferenceLookupResult boundResult(ReferenceLookupResult boundRes) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3130 |
return !boundRes.isSuccess() || boundRes.hasKind(StaticKind.NON_STATIC) ? |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3131 |
boundRes : //the search produces a non-static method |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3132 |
ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.sym, false)); |
28456
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 |
@Override |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3136 |
ReferenceLookupResult unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3137 |
if (boundRes.hasKind(StaticKind.STATIC) && |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3138 |
(!unboundRes.isSuccess() || unboundRes.hasKind(StaticKind.STATIC))) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3139 |
//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
|
3140 |
//during the second search |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3141 |
return boundRes; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3142 |
} else if (unboundRes.hasKind(StaticKind.NON_STATIC) && |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3143 |
(!boundRes.isSuccess() || boundRes.hasKind(StaticKind.NON_STATIC))) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3144 |
//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
|
3145 |
//during the first search |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3146 |
return unboundRes; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3147 |
} else if (boundRes.isSuccess() && unboundRes.isSuccess()) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3148 |
//both searches produce some result; ambiguity (error recovery) |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3149 |
return ReferenceLookupResult.error(ambiguityError(boundRes.sym, unboundRes.sym)); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3150 |
} else if (boundRes.isSuccess() || unboundRes.isSuccess()) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3151 |
//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
|
3152 |
//produces an non-static method). Alternatively, a given search produced a result |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3153 |
//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
|
3154 |
//staticness (error recovery) |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3155 |
return ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.isSuccess() ? |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3156 |
boundRes.sym : unboundRes.sym, true)); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3157 |
} else { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3158 |
//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
|
3159 |
return (boundRes.canIgnore() && !unboundRes.canIgnore()) ? |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3160 |
unboundRes : boundRes; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3161 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3162 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3163 |
}; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3164 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3165 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3166 |
* 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
|
3167 |
* is described in JLS SE 8 (15.12.2.1). |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3168 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3169 |
ReferenceChooser structuralReferenceChooser = new ReferenceChooser() { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3170 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3171 |
@Override |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3172 |
ReferenceLookupResult boundResult(ReferenceLookupResult boundRes) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3173 |
return (!boundRes.isSuccess() || !boundRes.hasKind(StaticKind.STATIC)) ? |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3174 |
boundRes : //the search has at least one applicable non-static method |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3175 |
ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.sym, false)); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3176 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3177 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3178 |
@Override |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3179 |
ReferenceLookupResult unboundResult(ReferenceLookupResult boundRes, ReferenceLookupResult unboundRes) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3180 |
if (boundRes.isSuccess() && !boundRes.hasKind(StaticKind.NON_STATIC)) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3181 |
//the first serach has at least one applicable static method |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3182 |
return boundRes; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3183 |
} else if (unboundRes.isSuccess() && !unboundRes.hasKind(StaticKind.STATIC)) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3184 |
//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
|
3185 |
return unboundRes; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3186 |
} else if (boundRes.isSuccess() || unboundRes.isSuccess()) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3187 |
//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
|
3188 |
//a non-static method (error recovery) |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3189 |
return ReferenceLookupResult.error(new BadMethodReferenceError(boundRes.isSuccess() ? |
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3190 |
boundRes.sym : unboundRes.sym, true)); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3191 |
} else { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3192 |
//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
|
3193 |
return (boundRes.canIgnore() && !unboundRes.canIgnore()) ? |
47297
a0116bcc65b7
8188144: regression in method reference type-checking
mcimadamore
parents:
47268
diff
changeset
|
3194 |
unboundRes : boundRes; |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3195 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3196 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3197 |
}; |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
3198 |
|
14444 | 3199 |
/** |
3200 |
* Helper for defining custom method-like lookup logic; a lookup helper |
|
3201 |
* provides hooks for (i) the actual lookup logic and (ii) accessing the |
|
3202 |
* lookup result (this step might result in compiler diagnostics to be generated) |
|
3203 |
*/ |
|
3204 |
abstract class LookupHelper { |
|
3205 |
||
3206 |
/** name of the symbol to lookup */ |
|
3207 |
Name name; |
|
3208 |
||
3209 |
/** location in which the lookup takes place */ |
|
3210 |
Type site; |
|
3211 |
||
3212 |
/** actual types used during the lookup */ |
|
3213 |
List<Type> argtypes; |
|
3214 |
||
3215 |
/** type arguments used during the lookup */ |
|
3216 |
List<Type> typeargtypes; |
|
3217 |
||
3218 |
/** Max overload resolution phase handled by this helper */ |
|
3219 |
MethodResolutionPhase maxPhase; |
|
3220 |
||
3221 |
LookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) { |
|
3222 |
this.name = name; |
|
3223 |
this.site = site; |
|
3224 |
this.argtypes = argtypes; |
|
3225 |
this.typeargtypes = typeargtypes; |
|
3226 |
this.maxPhase = maxPhase; |
|
3227 |
} |
|
3228 |
||
3229 |
/** |
|
3230 |
* Should lookup stop at given phase with given result |
|
3231 |
*/ |
|
26533
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
3232 |
final boolean shouldStop(Symbol sym, MethodResolutionPhase phase) { |
14444 | 3233 |
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
|
3234 |
!sym.kind.isResolutionError() || sym.kind == AMBIGUOUS; |
14444 | 3235 |
} |
3236 |
||
3237 |
/** |
|
3238 |
* Search for a symbol under a given overload resolution phase - this method |
|
3239 |
* is usually called several times, once per each overload resolution phase |
|
3240 |
*/ |
|
3241 |
abstract Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase); |
|
3242 |
||
3243 |
/** |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3244 |
* Dump overload resolution info |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3245 |
*/ |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3246 |
void debug(DiagnosticPosition pos, Symbol sym) { |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3247 |
//do nothing |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3248 |
} |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3249 |
|
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3250 |
/** |
14444 | 3251 |
* Validate the result of the lookup |
3252 |
*/ |
|
3253 |
abstract Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym); |
|
3254 |
} |
|
3255 |
||
3256 |
abstract class BasicLookupHelper extends LookupHelper { |
|
3257 |
||
3258 |
BasicLookupHelper(Name name, Type site, List<Type> argtypes, List<Type> typeargtypes) { |
|
17804
6bed8a263318
8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents:
17582
diff
changeset
|
3259 |
this(name, site, argtypes, typeargtypes, MethodResolutionPhase.VARARITY); |
6bed8a263318
8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents:
17582
diff
changeset
|
3260 |
} |
6bed8a263318
8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents:
17582
diff
changeset
|
3261 |
|
6bed8a263318
8014649: Regression: bug in Resolve.resolveOperator
mcimadamore
parents:
17582
diff
changeset
|
3262 |
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
|
3263 |
super(name, site, argtypes, typeargtypes, maxPhase); |
14444 | 3264 |
} |
3265 |
||
3266 |
@Override |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3267 |
final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3268 |
Symbol sym = doLookup(env, phase); |
15038 | 3269 |
if (sym.kind == AMBIGUOUS) { |
22161
d79fb23b5dca
8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents:
21718
diff
changeset
|
3270 |
AmbiguityError a_err = (AmbiguityError)sym.baseSymbol(); |
15038 | 3271 |
sym = a_err.mergeAbstracts(site); |
3272 |
} |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3273 |
return sym; |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3274 |
} |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3275 |
|
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3276 |
abstract Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase); |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3277 |
|
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3278 |
@Override |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3279 |
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
|
3280 |
if (sym.kind.isResolutionError()) { |
14444 | 3281 |
//if nothing is found return the 'first' error |
3282 |
sym = accessMethod(sym, pos, location, site, name, true, argtypes, typeargtypes); |
|
3283 |
} |
|
3284 |
return sym; |
|
3285 |
} |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3286 |
|
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3287 |
@Override |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3288 |
void debug(DiagnosticPosition pos, Symbol sym) { |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3289 |
reportVerboseResolutionDiagnostic(pos, name, site, argtypes, typeargtypes, sym); |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3290 |
} |
14444 | 3291 |
} |
3292 |
||
3293 |
/** |
|
3294 |
* Helper class for member reference lookup. A reference lookup helper |
|
3295 |
* defines the basic logic for member reference lookup; a method gives |
|
3296 |
* access to an 'unbound' helper used to perform an unbound member |
|
3297 |
* reference lookup. |
|
3298 |
*/ |
|
3299 |
abstract class ReferenceLookupHelper extends LookupHelper { |
|
3300 |
||
3301 |
/** The member reference tree */ |
|
3302 |
JCMemberReference referenceTree; |
|
3303 |
||
3304 |
ReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site, |
|
3305 |
List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) { |
|
3306 |
super(name, site, argtypes, typeargtypes, maxPhase); |
|
3307 |
this.referenceTree = referenceTree; |
|
3308 |
} |
|
3309 |
||
3310 |
/** |
|
3311 |
* Returns an unbound version of this lookup helper. By default, this |
|
3312 |
* method returns an dummy lookup helper. |
|
3313 |
*/ |
|
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
3314 |
ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3315 |
return null; |
14444 | 3316 |
} |
3317 |
||
3318 |
/** |
|
3319 |
* Get the kind of the member reference |
|
3320 |
*/ |
|
3321 |
abstract JCMemberReference.ReferenceKind referenceKind(Symbol sym); |
|
3322 |
||
3323 |
Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) { |
|
15038 | 3324 |
if (sym.kind == AMBIGUOUS) { |
22161
d79fb23b5dca
8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents:
21718
diff
changeset
|
3325 |
AmbiguityError a_err = (AmbiguityError)sym.baseSymbol(); |
15038 | 3326 |
sym = a_err.mergeAbstracts(site); |
3327 |
} |
|
14444 | 3328 |
//skip error reporting |
3329 |
return sym; |
|
3330 |
} |
|
3331 |
} |
|
3332 |
||
3333 |
/** |
|
3334 |
* Helper class for method reference lookup. The lookup logic is based |
|
3335 |
* upon Resolve.findMethod; in certain cases, this helper class has a |
|
3336 |
* corresponding unbound helper class (see UnboundMethodReferenceLookupHelper). |
|
3337 |
* In such cases, non-static lookup results are thrown away. |
|
3338 |
*/ |
|
3339 |
class MethodReferenceLookupHelper extends ReferenceLookupHelper { |
|
3340 |
||
29292
c10d63c667cd
8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents:
29146
diff
changeset
|
3341 |
/** The original method reference lookup site. */ |
c10d63c667cd
8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents:
29146
diff
changeset
|
3342 |
Type originalSite; |
c10d63c667cd
8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents:
29146
diff
changeset
|
3343 |
|
14444 | 3344 |
MethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site, |
3345 |
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
|
3346 |
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
|
3347 |
this.originalSite = site; |
14444 | 3348 |
} |
3349 |
||
16323
c4409c235642
8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents:
16322
diff
changeset
|
3350 |
@Override |
c4409c235642
8008537: Missing method reference lookup error when unbound search finds a static method
mcimadamore
parents:
16322
diff
changeset
|
3351 |
final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
14444 | 3352 |
return findMethod(env, site, name, argtypes, typeargtypes, |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3353 |
phase.isBoxingRequired(), phase.isVarargsRequired()); |
14444 | 3354 |
} |
3355 |
||
3356 |
@Override |
|
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
3357 |
ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3358 |
if (TreeInfo.isStaticSelector(referenceTree.expr, names)) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3359 |
if (argtypes.nonEmpty() && |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3360 |
(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
|
3361 |
types.isSubtypeUnchecked(inferenceContext.asUndetVar(argtypes.head), originalSite))) { |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3362 |
return new UnboundMethodReferenceLookupHelper(referenceTree, name, |
29292
c10d63c667cd
8073842: Invalid method reference when referencing a method on a wildcard type
mcimadamore
parents:
29146
diff
changeset
|
3363 |
originalSite, argtypes, typeargtypes, maxPhase); |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3364 |
} else { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3365 |
return new ReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3366 |
@Override |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3367 |
ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3368 |
return this; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3369 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3370 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3371 |
@Override |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3372 |
Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3373 |
return methodNotFound; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3374 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3375 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3376 |
@Override |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3377 |
ReferenceKind referenceKind(Symbol sym) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3378 |
Assert.error(); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3379 |
return null; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3380 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3381 |
}; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3382 |
} |
14444 | 3383 |
} else { |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
3384 |
return super.unboundLookup(inferenceContext); |
14444 | 3385 |
} |
3386 |
} |
|
3387 |
||
3388 |
@Override |
|
3389 |
ReferenceKind referenceKind(Symbol sym) { |
|
3390 |
if (sym.isStatic()) { |
|
14724
b542db73539a
8004101: Add checks for method reference well-formedness
mcimadamore
parents:
14547
diff
changeset
|
3391 |
return ReferenceKind.STATIC; |
14444 | 3392 |
} else { |
3393 |
Name selName = TreeInfo.name(referenceTree.getQualifierExpression()); |
|
3394 |
return selName != null && selName == names._super ? |
|
3395 |
ReferenceKind.SUPER : |
|
3396 |
ReferenceKind.BOUND; |
|
3397 |
} |
|
3398 |
} |
|
3399 |
} |
|
3400 |
||
3401 |
/** |
|
3402 |
* Helper class for unbound method reference lookup. Essentially the same |
|
3403 |
* as the basic method reference lookup helper; main difference is that static |
|
3404 |
* lookup results are thrown away. If qualifier type is raw, an attempt to |
|
3405 |
* infer a parameterized type is made using the first actual argument (that |
|
3406 |
* would otherwise be ignored during the lookup). |
|
3407 |
*/ |
|
3408 |
class UnboundMethodReferenceLookupHelper extends MethodReferenceLookupHelper { |
|
3409 |
||
3410 |
UnboundMethodReferenceLookupHelper(JCMemberReference referenceTree, Name name, Type site, |
|
3411 |
List<Type> argtypes, List<Type> typeargtypes, MethodResolutionPhase maxPhase) { |
|
16294
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15706
diff
changeset
|
3412 |
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
|
3413 |
if (site.isRaw() && !argtypes.head.hasTag(NONE)) { |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
3414 |
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
|
3415 |
this.site = types.skipTypeVars(asSuperSite, true); |
16294
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15706
diff
changeset
|
3416 |
} |
14444 | 3417 |
} |
3418 |
||
3419 |
@Override |
|
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18668
diff
changeset
|
3420 |
ReferenceLookupHelper unboundLookup(InferenceContext inferenceContext) { |
14444 | 3421 |
return this; |
3422 |
} |
|
3423 |
||
3424 |
@Override |
|
3425 |
ReferenceKind referenceKind(Symbol sym) { |
|
3426 |
return ReferenceKind.UNBOUND; |
|
3427 |
} |
|
3428 |
} |
|
3429 |
||
3430 |
/** |
|
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3431 |
* Helper class for array constructor lookup; an array constructor lookup |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3432 |
* 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
|
3433 |
* 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
|
3434 |
*/ |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3435 |
class ArrayConstructorReferenceLookupHelper extends ReferenceLookupHelper { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3436 |
|
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3437 |
ArrayConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes, |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3438 |
List<Type> typeargtypes, MethodResolutionPhase maxPhase) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3439 |
super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase); |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3440 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3441 |
|
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3442 |
@Override |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3443 |
protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
3444 |
WriteableScope sc = WriteableScope.create(syms.arrayClass); |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3445 |
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
|
3446 |
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
|
3447 |
sc.enter(arrayConstr); |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3448 |
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
|
3449 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3450 |
|
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3451 |
@Override |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3452 |
ReferenceKind referenceKind(Symbol sym) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3453 |
return ReferenceKind.ARRAY_CTOR; |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3454 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3455 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3456 |
|
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15038
diff
changeset
|
3457 |
/** |
14444 | 3458 |
* Helper class for constructor reference lookup. The lookup logic is based |
3459 |
* upon either Resolve.findMethod or Resolve.findDiamond - depending on |
|
3460 |
* whether the constructor reference needs diamond inference (this is the case |
|
3461 |
* if the qualifier type is raw). A special erroneous symbol is returned |
|
3462 |
* if the lookup returns the constructor of an inner class and there's no |
|
3463 |
* enclosing instance in scope. |
|
3464 |
*/ |
|
3465 |
class ConstructorReferenceLookupHelper extends ReferenceLookupHelper { |
|
3466 |
||
3467 |
boolean needsInference; |
|
3468 |
||
3469 |
ConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes, |
|
3470 |
List<Type> typeargtypes, MethodResolutionPhase maxPhase) { |
|
3471 |
super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase); |
|
3472 |
if (site.isRaw()) { |
|
26781
a786b07c7b91
8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents:
26533
diff
changeset
|
3473 |
this.site = new ClassType(site.getEnclosingType(), site.tsym.type.getTypeArguments(), site.tsym, site.getMetadata()); |
14444 | 3474 |
needsInference = true; |
3475 |
} |
|
3476 |
} |
|
3477 |
||
3478 |
@Override |
|
3479 |
protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
|
3480 |
Symbol sym = needsInference ? |
|
3481 |
findDiamond(env, site, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) : |
|
3482 |
findMethod(env, site, name, argtypes, typeargtypes, |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3483 |
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
|
3484 |
return enclosingInstanceMissing(env, site) ? new BadConstructorReferenceError(sym) : sym; |
14444 | 3485 |
} |
3486 |
||
3487 |
@Override |
|
3488 |
ReferenceKind referenceKind(Symbol sym) { |
|
3489 |
return site.getEnclosingType().hasTag(NONE) ? |
|
3490 |
ReferenceKind.TOPLEVEL : ReferenceKind.IMPLICIT_INNER; |
|
3491 |
} |
|
3492 |
} |
|
3493 |
||
3494 |
/** |
|
3495 |
* Main overload resolution routine. On each overload resolution step, a |
|
3496 |
* lookup helper class is used to perform the method/constructor lookup; |
|
3497 |
* at the end of the lookup, the helper is used to validate the results |
|
3498 |
* (this last step might trigger overload resolution diagnostics). |
|
3499 |
*/ |
|
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
3500 |
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
|
3501 |
MethodResolutionContext resolveContext = new MethodResolutionContext(); |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
3502 |
resolveContext.methodCheck = methodCheck; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
3503 |
return lookupMethod(env, pos, location, resolveContext, lookupHelper); |
14444 | 3504 |
} |
3505 |
||
3506 |
Symbol lookupMethod(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, |
|
3507 |
MethodResolutionContext resolveContext, LookupHelper lookupHelper) { |
|
3508 |
MethodResolutionContext prevResolutionContext = currentResolutionContext; |
|
3509 |
try { |
|
3510 |
Symbol bestSoFar = methodNotFound; |
|
3511 |
currentResolutionContext = resolveContext; |
|
3512 |
for (MethodResolutionPhase phase : methodResolutionSteps) { |
|
25445
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
3513 |
if (lookupHelper.shouldStop(bestSoFar, phase)) |
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
3514 |
break; |
14444 | 3515 |
MethodResolutionPhase prevPhase = currentResolutionContext.step; |
3516 |
Symbol prevBest = bestSoFar; |
|
3517 |
currentResolutionContext.step = phase; |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3518 |
Symbol sym = lookupHelper.lookup(env, phase); |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3519 |
lookupHelper.debug(pos, sym); |
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
3520 |
bestSoFar = phase.mergeResults(bestSoFar, sym); |
14444 | 3521 |
env.info.pendingResolutionPhase = (prevBest == bestSoFar) ? prevPhase : phase; |
3522 |
} |
|
3523 |
return lookupHelper.access(env, pos, location, bestSoFar); |
|
3524 |
} finally { |
|
3525 |
currentResolutionContext = prevResolutionContext; |
|
3526 |
} |
|
3527 |
} |
|
3528 |
||
3529 |
/** |
|
10 | 3530 |
* Resolve `c.name' where name == this or name == super. |
3531 |
* @param pos The position to use for error reporting. |
|
3532 |
* @param env The environment current at the expression. |
|
3533 |
* @param c The qualifier. |
|
3534 |
* @param name The identifier's name. |
|
3535 |
*/ |
|
3536 |
Symbol resolveSelf(DiagnosticPosition pos, |
|
3537 |
Env<AttrContext> env, |
|
3538 |
TypeSymbol c, |
|
3539 |
Name name) { |
|
3540 |
Env<AttrContext> env1 = env; |
|
3541 |
boolean staticOnly = false; |
|
3542 |
while (env1.outer != null) { |
|
3543 |
if (isStatic(env1)) staticOnly = true; |
|
3544 |
if (env1.enclClass.sym == c) { |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25435
diff
changeset
|
3545 |
Symbol sym = env1.info.scope.findFirst(name); |
10 | 3546 |
if (sym != null) { |
3547 |
if (staticOnly) sym = new StaticError(sym); |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
3548 |
return accessBase(sym, pos, env.enclClass.sym.type, |
10 | 3549 |
name, true); |
3550 |
} |
|
3551 |
} |
|
3552 |
if ((env1.enclClass.sym.flags() & STATIC) != 0) staticOnly = true; |
|
3553 |
env1 = env1.outer; |
|
3554 |
} |
|
23105
1d1ea26a10ae
8030855: Default methods should be visible under source previous to 8
vromero
parents:
22442
diff
changeset
|
3555 |
if (c.isInterface() && |
1d1ea26a10ae
8030855: Default methods should be visible under source previous to 8
vromero
parents:
22442
diff
changeset
|
3556 |
name == names._super && !isStatic(env) && |
1d1ea26a10ae
8030855: Default methods should be visible under source previous to 8
vromero
parents:
22442
diff
changeset
|
3557 |
types.isDirectSuperInterface(c, env.enclClass.sym)) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3558 |
//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
|
3559 |
for (Type t : pruneInterfaces(env.enclClass.type)) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3560 |
if (t.tsym == c) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3561 |
env.info.defaultSuperCallSite = t; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3562 |
return new VarSymbol(0, names._super, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3563 |
types.asSuper(env.enclClass.type, c), env.enclClass.sym); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3564 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3565 |
} |
39092
399acd370763
8058244: missing error in qualified default super call
vromero
parents:
38914
diff
changeset
|
3566 |
//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
|
3567 |
for (Type i : types.directSupertypes(env.enclClass.type)) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3568 |
if (i.tsym.isSubClass(c, types) && i.tsym != c) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3569 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3570 |
Errors.IllegalDefaultSuperCall(c, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3571 |
Fragments.RedundantSupertype(c, i))); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3572 |
return syms.errSymbol; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3573 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3574 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3575 |
Assert.error(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3576 |
} |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3577 |
log.error(pos, Errors.NotEnclClass(c)); |
10 | 3578 |
return syms.errSymbol; |
3579 |
} |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3580 |
//where |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3581 |
private List<Type> pruneInterfaces(Type t) { |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19940
diff
changeset
|
3582 |
ListBuffer<Type> result = new ListBuffer<>(); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3583 |
for (Type t1 : types.interfaces(t)) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3584 |
boolean shouldAdd = true; |
39092
399acd370763
8058244: missing error in qualified default super call
vromero
parents:
38914
diff
changeset
|
3585 |
for (Type t2 : types.directSupertypes(t)) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3586 |
if (t1 != t2 && types.isSubtypeNoCapture(t2, t1)) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3587 |
shouldAdd = false; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3588 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3589 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3590 |
if (shouldAdd) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3591 |
result.append(t1); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3592 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3593 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3594 |
return result.toList(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3595 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14359
diff
changeset
|
3596 |
|
10 | 3597 |
|
3598 |
/** |
|
3599 |
* Resolve `c.this' for an enclosing class c that contains the |
|
3600 |
* named member. |
|
3601 |
* @param pos The position to use for error reporting. |
|
3602 |
* @param env The environment current at the expression. |
|
3603 |
* @param member The member that must be contained in the result. |
|
3604 |
*/ |
|
3605 |
Symbol resolveSelfContaining(DiagnosticPosition pos, |
|
3606 |
Env<AttrContext> env, |
|
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3607 |
Symbol member, |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3608 |
boolean isSuperCall) { |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3609 |
Symbol sym = resolveSelfContainingInternal(env, member, isSuperCall); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3610 |
if (sym == null) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3611 |
log.error(pos, Errors.EnclClassRequired(member)); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3612 |
return syms.errSymbol; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3613 |
} else { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3614 |
return accessBase(sym, pos, env.enclClass.sym.type, sym.name, true); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3615 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3616 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3617 |
|
33019
2dc64d1f5e18
8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents:
32951
diff
changeset
|
3618 |
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
|
3619 |
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
|
3620 |
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
|
3621 |
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
|
3622 |
} |
2dc64d1f5e18
8139245: compiler crashes with exception on int:new method reference and generic method inference
sadayapalam
parents:
32951
diff
changeset
|
3623 |
return false; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3624 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3625 |
|
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3626 |
private Symbol resolveSelfContainingInternal(Env<AttrContext> env, |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3627 |
Symbol member, |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3628 |
boolean isSuperCall) { |
10 | 3629 |
Name name = names._this; |
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3630 |
Env<AttrContext> env1 = isSuperCall ? env.outer : env; |
10 | 3631 |
boolean staticOnly = false; |
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3632 |
if (env1 != null) { |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3633 |
while (env1 != null && env1.outer != null) { |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3634 |
if (isStatic(env1)) staticOnly = true; |
34561
79c436257611
8144673: Suspect message regarding suitable enclosing instance not being in scope
sadayapalam
parents:
33019
diff
changeset
|
3635 |
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
|
3636 |
Symbol sym = env1.info.scope.findFirst(name); |
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3637 |
if (sym != null) { |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3638 |
if (staticOnly) sym = new StaticError(sym); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3639 |
return sym; |
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3640 |
} |
10 | 3641 |
} |
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3642 |
if ((env1.enclClass.sym.flags() & STATIC) != 0) |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3643 |
staticOnly = true; |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3644 |
env1 = env1.outer; |
10 | 3645 |
} |
3646 |
} |
|
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3647 |
return null; |
10 | 3648 |
} |
3649 |
||
3650 |
/** |
|
3651 |
* 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
|
3652 |
* JLS 8.8.5.1 and 15.9.2 |
10 | 3653 |
*/ |
3654 |
Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t) { |
|
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3655 |
return resolveImplicitThis(pos, env, t, false); |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3656 |
} |
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3657 |
|
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3658 |
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
|
3659 |
Type thisType = (t.tsym.owner.kind.matches(KindSelector.VAL_MTH) |
10 | 3660 |
? resolveSelf(pos, env, t.getEnclosingType().tsym, names._this) |
8622
4f032629a0fd
6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents:
8430
diff
changeset
|
3661 |
: resolveSelfContaining(pos, env, t.tsym, isSuperCall)).type; |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3662 |
if (env.info.isSelfCall && thisType.tsym == env.enclClass.sym) { |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3663 |
log.error(pos, Errors.CantRefBeforeCtorCalled("this")); |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3664 |
} |
10 | 3665 |
return thisType; |
3666 |
} |
|
3667 |
||
3668 |
/* *************************************************************************** |
|
3669 |
* ResolveError classes, indicating error situations when accessing symbols |
|
3670 |
****************************************************************************/ |
|
3671 |
||
12082
32bdf6ef6388
7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents:
12078
diff
changeset
|
3672 |
//used by TransTypes when checking target type of synthetic cast |
32bdf6ef6388
7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents:
12078
diff
changeset
|
3673 |
public void logAccessErrorInternal(Env<AttrContext> env, JCTree tree, Type type) { |
32bdf6ef6388
7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents:
12078
diff
changeset
|
3674 |
AccessError error = new AccessError(env, env.enclClass.type, type.tsym); |
32bdf6ef6388
7151070: NullPointerException in Resolve.isAccessible
mcimadamore
parents:
12078
diff
changeset
|
3675 |
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
|
3676 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3677 |
//where |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3678 |
private void logResolveError(ResolveError error, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3679 |
DiagnosticPosition pos, |
8045 | 3680 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3681 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3682 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3683 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3684 |
List<Type> typeargtypes) { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3685 |
JCDiagnostic d = error.getDiagnostic(JCDiagnostic.DiagnosticType.ERROR, |
8045 | 3686 |
pos, location, site, name, argtypes, typeargtypes); |
6356
af24929939ca
6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents:
6344
diff
changeset
|
3687 |
if (d != null) { |
af24929939ca
6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents:
6344
diff
changeset
|
3688 |
d.setFlag(DiagnosticFlag.RESOLVE_ERROR); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3689 |
log.report(d); |
6356
af24929939ca
6976747: JCDiagnostic: replace "boolean mandatory" with new "Set<JCDiagnostic.Flag>"
jjg
parents:
6344
diff
changeset
|
3690 |
} |
10 | 3691 |
} |
3692 |
||
1534
e923a41e84cc
6758789: Some method resolution diagnostic should be improved
mcimadamore
parents:
1533
diff
changeset
|
3693 |
private final LocalizedString noArgs = new LocalizedString("compiler.misc.no.args"); |
e923a41e84cc
6758789: Some method resolution diagnostic should be improved
mcimadamore
parents:
1533
diff
changeset
|
3694 |
|
e923a41e84cc
6758789: Some method resolution diagnostic should be improved
mcimadamore
parents:
1533
diff
changeset
|
3695 |
public Object methodArguments(List<Type> argtypes) { |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3696 |
if (argtypes == null || argtypes.isEmpty()) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3697 |
return noArgs; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3698 |
} else { |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19940
diff
changeset
|
3699 |
ListBuffer<Object> diagArgs = new ListBuffer<>(); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3700 |
for (Type t : argtypes) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
3701 |
if (t.hasTag(DEFERRED)) { |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3702 |
diagArgs.append(((DeferredAttr.DeferredType)t).tree); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3703 |
} else { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3704 |
diagArgs.append(t); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3705 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3706 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3707 |
return diagArgs; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
3708 |
} |
1534
e923a41e84cc
6758789: Some method resolution diagnostic should be improved
mcimadamore
parents:
1533
diff
changeset
|
3709 |
} |
e923a41e84cc
6758789: Some method resolution diagnostic should be improved
mcimadamore
parents:
1533
diff
changeset
|
3710 |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3711 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3712 |
* Root class for resolution errors. Subclass of ResolveError |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3713 |
* represent a different kinds of resolution error - as such they must |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3714 |
* specify how they map into concrete compiler diagnostics. |
10 | 3715 |
*/ |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3716 |
abstract class ResolveError extends Symbol { |
10 | 3717 |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3718 |
/** The name of the kind of error, for debugging only. */ |
10 | 3719 |
final String debugName; |
3720 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
3721 |
ResolveError(Kind kind, String debugName) { |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3722 |
super(kind, 0, null, null, null); |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3723 |
this.debugName = debugName; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3724 |
} |
10 | 3725 |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
25874
diff
changeset
|
3726 |
@Override @DefinedBy(Api.LANGUAGE_MODEL) |
10 | 3727 |
public <R, P> R accept(ElementVisitor<R, P> v, P p) { |
3728 |
throw new AssertionError(); |
|
3729 |
} |
|
3730 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3731 |
@Override |
10 | 3732 |
public String toString() { |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3733 |
return debugName; |
10 | 3734 |
} |
3735 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3736 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3737 |
public boolean exists() { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3738 |
return false; |
10 | 3739 |
} |
3740 |
||
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3741 |
@Override |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3742 |
public boolean isStatic() { |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3743 |
return false; |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3744 |
} |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3745 |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3746 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3747 |
* Create an external representation for this erroneous symbol to be |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3748 |
* used during attribution - by default this returns the symbol of a |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3749 |
* brand new error type which stores the original type found |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3750 |
* during resolution. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3751 |
* |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3752 |
* @param name the name used during resolution |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3753 |
* @param location the location from which the symbol is accessed |
10 | 3754 |
*/ |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3755 |
protected Symbol access(Name name, TypeSymbol location) { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3756 |
return types.createErrorType(name, location, syms.errSymbol.type).tsym; |
10 | 3757 |
} |
3758 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3759 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3760 |
* Create a diagnostic representing this resolution error. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3761 |
* |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3762 |
* @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
|
3763 |
* @param pos The position to be used for error reporting. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3764 |
* @param site The original type from where the selection took place. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3765 |
* @param name The name of the symbol to be resolved. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3766 |
* @param argtypes The invocation's value arguments, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3767 |
* if we looked for a method. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3768 |
* @param typeargtypes The invocation's type arguments, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3769 |
* if we looked for a method. |
10 | 3770 |
*/ |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3771 |
abstract JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3772 |
DiagnosticPosition pos, |
8045 | 3773 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3774 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3775 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3776 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3777 |
List<Type> typeargtypes); |
10 | 3778 |
} |
3779 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3780 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3781 |
* 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
|
3782 |
* an invalid symbol being found during resolution. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3783 |
*/ |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3784 |
abstract class InvalidSymbolError extends ResolveError { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3785 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3786 |
/** The invalid symbol found during resolution */ |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3787 |
Symbol sym; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3788 |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
3789 |
InvalidSymbolError(Kind kind, Symbol sym, String debugName) { |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3790 |
super(kind, debugName); |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3791 |
this.sym = sym; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3792 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3793 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3794 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3795 |
public boolean exists() { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3796 |
return true; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3797 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3798 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3799 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3800 |
public String toString() { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3801 |
return super.toString() + " wrongSym=" + sym; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3802 |
} |
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 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3805 |
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
|
3806 |
if (!sym.kind.isResolutionError() && sym.kind.matches(KindSelector.TYP)) |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3807 |
return types.createErrorType(name, location, sym.type).tsym; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3808 |
else |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3809 |
return sym; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3810 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3811 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3812 |
|
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3813 |
class BadVarTypeError extends ResolveError { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3814 |
BadVarTypeError() { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3815 |
super(Kind.BAD_VAR, "bad var use"); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3816 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3817 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3818 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3819 |
JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3820 |
return diags.create(dkind, log.currentSource(), pos, "illegal.ref.to.var.type", name); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3821 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3822 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
3823 |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3824 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3825 |
* InvalidSymbolError error class indicating that a symbol matching a |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3826 |
* given name does not exists in a given site. |
10 | 3827 |
*/ |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3828 |
class SymbolNotFoundError extends ResolveError { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3829 |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
3830 |
SymbolNotFoundError(Kind kind) { |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3831 |
this(kind, "symbol not found error"); |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3832 |
} |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3833 |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
3834 |
SymbolNotFoundError(Kind kind, String debugName) { |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
21024
diff
changeset
|
3835 |
super(kind, debugName); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3836 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3837 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3838 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3839 |
JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3840 |
DiagnosticPosition pos, |
8045 | 3841 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3842 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3843 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3844 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3845 |
List<Type> typeargtypes) { |
42828
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
42827
diff
changeset
|
3846 |
argtypes = argtypes == null ? List.nil() : argtypes; |
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
42827
diff
changeset
|
3847 |
typeargtypes = typeargtypes == null ? List.nil() : typeargtypes; |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3848 |
if (name == names.error) |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3849 |
return null; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3850 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3851 |
boolean hasLocation = false; |
8239
d2c934e951e2
7014715: javac returns different error code for certain failure(s)
mcimadamore
parents:
8237
diff
changeset
|
3852 |
if (location == null) { |
d2c934e951e2
7014715: javac returns different error code for certain failure(s)
mcimadamore
parents:
8237
diff
changeset
|
3853 |
location = site.tsym; |
d2c934e951e2
7014715: javac returns different error code for certain failure(s)
mcimadamore
parents:
8237
diff
changeset
|
3854 |
} |
8045 | 3855 |
if (!location.name.isEmpty()) { |
3856 |
if (location.kind == PCK && !site.tsym.exists()) { |
|
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
5857
diff
changeset
|
3857 |
return diags.create(dkind, log.currentSource(), pos, |
8045 | 3858 |
"doesnt.exist", location); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3859 |
} |
8045 | 3860 |
hasLocation = !location.name.equals(names._this) && |
3861 |
!location.name.equals(names._super); |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3862 |
} |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
3863 |
boolean isConstructor = name == names.init; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
3864 |
KindName kindname = isConstructor ? KindName.CONSTRUCTOR : kind.absentKind(); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3865 |
Name idname = isConstructor ? site.tsym.name : name; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3866 |
String errKey = getErrorKey(kindname, typeargtypes.nonEmpty(), hasLocation); |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3867 |
if (hasLocation) { |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
5857
diff
changeset
|
3868 |
return diags.create(dkind, log.currentSource(), pos, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3869 |
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
|
3870 |
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
|
3871 |
getLocationDiag(location, site)); //location kindname, type |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3872 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3873 |
else { |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
5857
diff
changeset
|
3874 |
return diags.create(dkind, log.currentSource(), pos, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3875 |
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
|
3876 |
typeargtypes, args(argtypes)); //type parameters and arguments (if any) |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3877 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3878 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3879 |
//where |
14953
89a34297b198
8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents:
14801
diff
changeset
|
3880 |
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
|
3881 |
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
|
3882 |
} |
89a34297b198
8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
mcimadamore
parents:
14801
diff
changeset
|
3883 |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3884 |
private String getErrorKey(KindName kindname, boolean hasTypeArgs, boolean hasLocation) { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3885 |
String key = "cant.resolve"; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3886 |
String suffix = hasLocation ? ".location" : ""; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3887 |
switch (kindname) { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3888 |
case METHOD: |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3889 |
case CONSTRUCTOR: { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3890 |
suffix += ".args"; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3891 |
suffix += hasTypeArgs ? ".params" : ""; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3892 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3893 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3894 |
return key + suffix; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3895 |
} |
8239
d2c934e951e2
7014715: javac returns different error code for certain failure(s)
mcimadamore
parents:
8237
diff
changeset
|
3896 |
private JCDiagnostic getLocationDiag(Symbol location, Type site) { |
d2c934e951e2
7014715: javac returns different error code for certain failure(s)
mcimadamore
parents:
8237
diff
changeset
|
3897 |
if (location.kind == VAR) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3898 |
return diags.fragment(Fragments.Location1(kindName(location), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3899 |
location, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3900 |
location.type)); |
8239
d2c934e951e2
7014715: javac returns different error code for certain failure(s)
mcimadamore
parents:
8237
diff
changeset
|
3901 |
} else { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3902 |
return diags.fragment(Fragments.Location(typeKindName(site), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3903 |
site, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
3904 |
null)); |
8239
d2c934e951e2
7014715: javac returns different error code for certain failure(s)
mcimadamore
parents:
8237
diff
changeset
|
3905 |
} |
8045 | 3906 |
} |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3907 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3908 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3909 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3910 |
* InvalidSymbolError error class indicating that a given symbol |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3911 |
* (either a method, a constructor or an operand) is not applicable |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3912 |
* given an actual arguments/type argument list. |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3913 |
*/ |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3914 |
class InapplicableSymbolError extends ResolveError { |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3915 |
|
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3916 |
protected MethodResolutionContext resolveContext; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3917 |
|
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3918 |
InapplicableSymbolError(MethodResolutionContext context) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3919 |
this(WRONG_MTH, "inapplicable symbol error", context); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3920 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3921 |
|
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
3922 |
protected InapplicableSymbolError(Kind kind, String debugName, MethodResolutionContext context) { |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3923 |
super(kind, debugName); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3924 |
this.resolveContext = context; |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3925 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3926 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3927 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3928 |
public String toString() { |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3929 |
return super.toString(); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3930 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3931 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3932 |
@Override |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3933 |
public boolean exists() { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3934 |
return true; |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3935 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3936 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3937 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3938 |
JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3939 |
DiagnosticPosition pos, |
8045 | 3940 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3941 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3942 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3943 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3944 |
List<Type> typeargtypes) { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3945 |
if (name == names.error) |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3946 |
return null; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3947 |
|
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3948 |
Pair<Symbol, JCDiagnostic> c = errCandidate(); |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3949 |
if (compactMethodDiags) { |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3950 |
JCDiagnostic simpleDiag = |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3951 |
MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, c.snd); |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3952 |
if (simpleDiag != null) { |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3953 |
return simpleDiag; |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3954 |
} |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3955 |
} |
29051
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3956 |
Symbol ws = c.fst.asMemberOf(site, types); |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3957 |
return diags.create(dkind, log.currentSource(), pos, |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3958 |
"cant.apply.symbol", |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3959 |
kindName(ws), |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3960 |
ws.name == names.init ? ws.owner.name : ws.name, |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3961 |
methodArguments(ws.type.getParameterTypes()), |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3962 |
methodArguments(argtypes), |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3963 |
kindName(ws.owner), |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3964 |
ws.owner.type, |
7244db2ab176
8071241: Investigate alternate strategy for type-checking operators
mcimadamore
parents:
28456
diff
changeset
|
3965 |
c.snd); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3966 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3967 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3968 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3969 |
public Symbol access(Name name, TypeSymbol location) { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3970 |
return types.createErrorType(name, location, syms.errSymbol.type).tsym; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3971 |
} |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3972 |
|
18913 | 3973 |
protected Pair<Symbol, JCDiagnostic> errCandidate() { |
14444 | 3974 |
Candidate bestSoFar = null; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3975 |
for (Candidate c : resolveContext.candidates) { |
14444 | 3976 |
if (c.isApplicable()) continue; |
3977 |
bestSoFar = c; |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3978 |
} |
14444 | 3979 |
Assert.checkNonNull(bestSoFar); |
22163 | 3980 |
return new Pair<>(bestSoFar.sym, bestSoFar.details); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3981 |
} |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3982 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3983 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3984 |
/** |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
3985 |
* 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
|
3986 |
* is not applicable given an actual arguments/type argument list. |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3987 |
*/ |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
3988 |
class InapplicableSymbolsError extends InapplicableSymbolError { |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
3989 |
|
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3990 |
InapplicableSymbolsError(MethodResolutionContext context) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
3991 |
super(WRONG_MTHS, "inapplicable symbols", context); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3992 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3993 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3994 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3995 |
JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3996 |
DiagnosticPosition pos, |
8045 | 3997 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3998 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
3999 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4000 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4001 |
List<Type> typeargtypes) { |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4002 |
Map<Symbol, JCDiagnostic> candidatesMap = mapCandidates(); |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
4003 |
Map<Symbol, JCDiagnostic> filteredCandidates = compactMethodDiags ? |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
4004 |
filterCandidates(candidatesMap) : |
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
4005 |
mapCandidates(); |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4006 |
if (filteredCandidates.isEmpty()) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4007 |
filteredCandidates = candidatesMap; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4008 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4009 |
boolean truncatedDiag = candidatesMap.size() != filteredCandidates.size(); |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4010 |
if (filteredCandidates.size() > 1) { |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4011 |
JCDiagnostic err = diags.create(dkind, |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4012 |
null, |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4013 |
truncatedDiag ? |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4014 |
EnumSet.of(DiagnosticFlag.COMPRESSED) : |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4015 |
EnumSet.noneOf(DiagnosticFlag.class), |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4016 |
log.currentSource(), |
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4017 |
pos, |
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4018 |
"cant.apply.symbols", |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26991
diff
changeset
|
4019 |
name == names.init ? KindName.CONSTRUCTOR : kind.absentKind(), |
14444 | 4020 |
name == names.init ? site.tsym.name : name, |
14547 | 4021 |
methodArguments(argtypes)); |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4022 |
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
|
4023 |
} else if (filteredCandidates.size() == 1) { |
18913 | 4024 |
Map.Entry<Symbol, JCDiagnostic> _e = |
4025 |
filteredCandidates.entrySet().iterator().next(); |
|
22163 | 4026 |
final Pair<Symbol, JCDiagnostic> p = new Pair<>(_e.getKey(), _e.getValue()); |
18913 | 4027 |
JCDiagnostic d = new InapplicableSymbolError(resolveContext) { |
4028 |
@Override |
|
4029 |
protected Pair<Symbol, JCDiagnostic> errCandidate() { |
|
4030 |
return p; |
|
4031 |
} |
|
4032 |
}.getDiagnostic(dkind, pos, |
|
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4033 |
location, site, name, argtypes, typeargtypes); |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4034 |
if (truncatedDiag) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4035 |
d.setFlag(DiagnosticFlag.COMPRESSED); |
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 |
return d; |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4038 |
} else { |
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4039 |
return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind, pos, |
8045 | 4040 |
location, site, name, argtypes, typeargtypes); |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4041 |
} |
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4042 |
} |
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4043 |
//where |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4044 |
private Map<Symbol, JCDiagnostic> mapCandidates() { |
47298
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4045 |
MostSpecificMap candidates = new MostSpecificMap(); |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4046 |
for (Candidate c : resolveContext.candidates) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4047 |
if (c.isApplicable()) continue; |
47298
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4048 |
candidates.put(c); |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4049 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4050 |
return candidates; |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4051 |
} |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4052 |
|
47298
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4053 |
@SuppressWarnings("serial") |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4054 |
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
|
4055 |
private void put(Candidate c) { |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4056 |
ListBuffer<Symbol> overridden = new ListBuffer<>(); |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4057 |
for (Symbol s : keySet()) { |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4058 |
if (s == c.sym) { |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4059 |
continue; |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4060 |
} |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4061 |
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
|
4062 |
overridden.add(s); |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4063 |
} 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
|
4064 |
return; |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4065 |
} |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4066 |
} |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4067 |
for (Symbol s : overridden) { |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4068 |
remove(s); |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4069 |
} |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4070 |
put(c.sym, c.details); |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4071 |
} |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4072 |
} |
2e947e1bd907
8187978: javac can show overload error messages that include non-valid candidates
vromero
parents:
47297
diff
changeset
|
4073 |
|
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4074 |
Map<Symbol, JCDiagnostic> filterCandidates(Map<Symbol, JCDiagnostic> candidatesMap) { |
22163 | 4075 |
Map<Symbol, JCDiagnostic> candidates = new LinkedHashMap<>(); |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4076 |
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
|
4077 |
JCDiagnostic d = _entry.getValue(); |
19129
b1409ae675f8
8020843: javac crashes on accessibility check with method reference with typevar receiver
mcimadamore
parents:
18914
diff
changeset
|
4078 |
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
|
4079 |
candidates.put(_entry.getKey(), d); |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4080 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4081 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4082 |
return candidates; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4083 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4084 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4085 |
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
|
4086 |
List<JCDiagnostic> details = List.nil(); |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4087 |
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
|
4088 |
Symbol sym = _entry.getKey(); |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
4089 |
JCDiagnostic detailDiag = |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
4090 |
diags.fragment(Fragments.InapplicableMethod(Kinds.kindName(sym), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
4091 |
sym.location(site, types), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
4092 |
sym.asMemberOf(site, types), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
4093 |
_entry.getValue())); |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4094 |
details = details.prepend(detailDiag); |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4095 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4096 |
//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
|
4097 |
//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
|
4098 |
//conform to source order |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4099 |
return details; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4100 |
} |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4101 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4102 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4103 |
/** |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4104 |
* 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
|
4105 |
* given an actual arguments/type argument list using diamond inference. |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4106 |
*/ |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4107 |
class DiamondError extends InapplicableSymbolError { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4108 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4109 |
Symbol sym; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4110 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4111 |
public DiamondError(Symbol sym, MethodResolutionContext context) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4112 |
super(sym.kind, "diamondError", context); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4113 |
this.sym = sym; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4114 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4115 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4116 |
JCDiagnostic getDetails() { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4117 |
return (sym.kind == WRONG_MTH) ? |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4118 |
((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd : |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4119 |
null; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4120 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4121 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4122 |
@Override |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4123 |
JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos, |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4124 |
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
|
4125 |
JCDiagnostic details = getDetails(); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4126 |
if (details != null && compactMethodDiags) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4127 |
JCDiagnostic simpleDiag = |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4128 |
MethodResolutionDiagHelper.rewrite(diags, pos, log.currentSource(), dkind, details); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4129 |
if (simpleDiag != null) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4130 |
return simpleDiag; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4131 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4132 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4133 |
String key = details == null ? |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4134 |
"cant.apply.diamond" : |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4135 |
"cant.apply.diamond.1"; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4136 |
return diags.create(dkind, log.currentSource(), pos, key, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44504
diff
changeset
|
4137 |
Fragments.Diamond(site.tsym), details); |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4138 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4139 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4140 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4141 |
/** |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4142 |
* An InvalidSymbolError error class indicating that a symbol is not |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4143 |
* accessible from a given site |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4144 |
*/ |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4145 |
class AccessError extends InvalidSymbolError { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4146 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4147 |
private Env<AttrContext> env; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4148 |
private Type site; |
10 | 4149 |
|
4150 |
AccessError(Env<AttrContext> env, Type site, Symbol sym) { |
|
4151 |
super(HIDDEN, sym, "access error"); |
|
4152 |
this.env = env; |
|
4153 |
this.site = site; |
|
4154 |
} |
|
4155 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4156 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4157 |
public boolean exists() { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4158 |
return false; |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4159 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4160 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4161 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4162 |
JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4163 |
DiagnosticPosition pos, |
8045 | 4164 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4165 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4166 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4167 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4168 |
List<Type> typeargtypes) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
4169 |
if (sym.owner.type.hasTag(ERROR)) |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4170 |
return null; |
10 | 4171 |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4172 |
if (sym.name == names.init && sym.owner != site.tsym) { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4173 |
return new SymbolNotFoundError(ABSENT_MTH).getDiagnostic(dkind, |
8045 | 4174 |
pos, location, site, name, argtypes, typeargtypes); |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4175 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4176 |
else if ((sym.flags() & PUBLIC) != 0 |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4177 |
|| (env != null && this.site != null |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4178 |
&& !isAccessible(env, this.site))) { |
36526 | 4179 |
if (sym.owner.kind == PCK) { |
4180 |
return diags.create(dkind, log.currentSource(), |
|
4181 |
pos, "not.def.access.package.cant.access", |
|
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4182 |
sym, sym.location(), inaccessiblePackageReason(env, sym.packge())); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4183 |
} else if ( sym.packge() != syms.rootPackage |
43866
3195ea126044
8175007: Incorrect error messages for inaccessible classes in visible packages
jlahoda
parents:
43865
diff
changeset
|
4184 |
&& !symbolPackageVisible(env, sym)) { |
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4185 |
return diags.create(dkind, log.currentSource(), |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4186 |
pos, "not.def.access.class.intf.cant.access.reason", |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4187 |
sym, sym.location(), sym.location().packge(), |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4188 |
inaccessiblePackageReason(env, sym.packge())); |
36526 | 4189 |
} else { |
4190 |
return diags.create(dkind, log.currentSource(), |
|
4191 |
pos, "not.def.access.class.intf.cant.access", |
|
4192 |
sym, sym.location()); |
|
4193 |
} |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4194 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4195 |
else if ((sym.flags() & (PRIVATE | PROTECTED)) != 0) { |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
5857
diff
changeset
|
4196 |
return diags.create(dkind, log.currentSource(), |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4197 |
pos, "report.access", sym, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4198 |
asFlagSet(sym.flags() & (PRIVATE | PROTECTED)), |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4199 |
sym.location()); |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4200 |
} |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4201 |
else { |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
5857
diff
changeset
|
4202 |
return diags.create(dkind, log.currentSource(), |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4203 |
pos, "not.def.public.cant.access", sym, sym.location()); |
10 | 4204 |
} |
4205 |
} |
|
36526 | 4206 |
|
4207 |
private String toString(Type type) { |
|
4208 |
StringBuilder sb = new StringBuilder(); |
|
4209 |
sb.append(type); |
|
4210 |
if (type != null) { |
|
4211 |
sb.append("[tsym:").append(type.tsym); |
|
4212 |
if (type.tsym != null) |
|
4213 |
sb.append("packge:").append(type.tsym.packge()); |
|
4214 |
sb.append("]"); |
|
4215 |
} |
|
4216 |
return sb.toString(); |
|
4217 |
} |
|
10 | 4218 |
} |
4219 |
||
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4220 |
class InvisibleSymbolError extends InvalidSymbolError { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4221 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4222 |
private final Env<AttrContext> env; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4223 |
private final boolean suppressError; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4224 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4225 |
InvisibleSymbolError(Env<AttrContext> env, boolean suppressError, Symbol sym) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4226 |
super(HIDDEN, sym, "invisible class error"); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4227 |
this.env = env; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4228 |
this.suppressError = suppressError; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4229 |
this.name = sym.name; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4230 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4231 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4232 |
@Override |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4233 |
JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4234 |
DiagnosticPosition pos, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4235 |
Symbol location, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4236 |
Type site, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4237 |
Name name, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4238 |
List<Type> argtypes, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4239 |
List<Type> typeargtypes) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4240 |
if (suppressError) |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4241 |
return null; |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4242 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4243 |
if (sym.kind == PCK) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4244 |
JCDiagnostic details = inaccessiblePackageReason(env, sym.packge()); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4245 |
return diags.create(dkind, log.currentSource(), |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4246 |
pos, "package.not.visible", sym, details); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4247 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4248 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4249 |
JCDiagnostic details = inaccessiblePackageReason(env, sym.packge()); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4250 |
|
43272
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4251 |
if (pos.getTree() != null) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4252 |
Symbol o = sym; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4253 |
JCTree tree = pos.getTree(); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4254 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4255 |
while (o.kind != PCK && tree.hasTag(SELECT)) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4256 |
o = o.owner; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4257 |
tree = ((JCFieldAccess) tree).selected; |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4258 |
} |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4259 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4260 |
if (o.kind == PCK) { |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4261 |
pos = tree.pos(); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4262 |
|
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4263 |
return diags.create(dkind, log.currentSource(), |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4264 |
pos, "package.not.visible", o, details); |
421ae1e38d2d
8173117: Compilation significantly slower after JDK-8169197
jlahoda
parents:
43138
diff
changeset
|
4265 |
} |
43138
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 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4268 |
return diags.create(dkind, log.currentSource(), |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4269 |
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
|
4270 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4271 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4272 |
|
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4273 |
JCDiagnostic inaccessiblePackageReason(Env<AttrContext> env, PackageSymbol sym) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4274 |
//no dependency: |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4275 |
if (!env.toplevel.modle.readModules.contains(sym.modle)) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4276 |
//does not read: |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4277 |
if (sym.modle != syms.unnamedModule) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4278 |
if (env.toplevel.modle != syms.unnamedModule) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4279 |
return diags.fragment(Fragments.NotDefAccessDoesNotRead(env.toplevel.modle, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4280 |
sym, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4281 |
sym.modle)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4282 |
} else { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4283 |
return diags.fragment(Fragments.NotDefAccessDoesNotReadFromUnnamed(sym, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4284 |
sym.modle)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4285 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4286 |
} else { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4287 |
return diags.fragment(Fragments.NotDefAccessDoesNotReadUnnamed(sym, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4288 |
env.toplevel.modle)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4289 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4290 |
} else { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4291 |
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
|
4292 |
//not exported to this module: |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4293 |
if (env.toplevel.modle != syms.unnamedModule) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4294 |
return diags.fragment(Fragments.NotDefAccessNotExportedToModule(sym, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4295 |
sym.modle, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4296 |
env.toplevel.modle)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4297 |
} else { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4298 |
return diags.fragment(Fragments.NotDefAccessNotExportedToModuleFromUnnamed(sym, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4299 |
sym.modle)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4300 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4301 |
} else { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4302 |
//not exported: |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4303 |
if (env.toplevel.modle != syms.unnamedModule) { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4304 |
return diags.fragment(Fragments.NotDefAccessNotExported(sym, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4305 |
sym.modle)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4306 |
} else { |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4307 |
return diags.fragment(Fragments.NotDefAccessNotExportedFromUnnamed(sym, |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4308 |
sym.modle)); |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4309 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4310 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4311 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4312 |
} |
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
43131
diff
changeset
|
4313 |
|
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4314 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4315 |
* InvalidSymbolError error class indicating that an instance member |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4316 |
* has erroneously been accessed from a static context. |
10 | 4317 |
*/ |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4318 |
class StaticError extends InvalidSymbolError { |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4319 |
|
10 | 4320 |
StaticError(Symbol sym) { |
4321 |
super(STATICERR, sym, "static error"); |
|
4322 |
} |
|
4323 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4324 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4325 |
JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4326 |
DiagnosticPosition pos, |
8045 | 4327 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4328 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4329 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4330 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4331 |
List<Type> typeargtypes) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14062
diff
changeset
|
4332 |
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
|
4333 |
? types.erasure(sym.type).tsym |
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
735
diff
changeset
|
4334 |
: sym); |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
5857
diff
changeset
|
4335 |
return diags.create(dkind, log.currentSource(), pos, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4336 |
"non-static.cant.be.ref", kindName(sym), errSym); |
10 | 4337 |
} |
4338 |
} |
|
4339 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4340 |
/** |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4341 |
* InvalidSymbolError error class indicating that a pair of symbols |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4342 |
* (either methods, constructors or operands) are ambiguous |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4343 |
* given an actual arguments/type argument list. |
10 | 4344 |
*/ |
15038 | 4345 |
class AmbiguityError extends ResolveError { |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4346 |
|
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4347 |
/** The other maximally specific symbol */ |
15038 | 4348 |
List<Symbol> ambiguousSyms = List.nil(); |
4349 |
||
4350 |
@Override |
|
4351 |
public boolean exists() { |
|
4352 |
return true; |
|
4353 |
} |
|
10 | 4354 |
|
4355 |
AmbiguityError(Symbol sym1, Symbol sym2) { |
|
15038 | 4356 |
super(AMBIGUOUS, "ambiguity error"); |
4357 |
ambiguousSyms = flatten(sym2).appendList(flatten(sym1)); |
|
4358 |
} |
|
4359 |
||
4360 |
private List<Symbol> flatten(Symbol sym) { |
|
4361 |
if (sym.kind == AMBIGUOUS) { |
|
22161
d79fb23b5dca
8029569: internal javac cast exception when resolving varargs ambiguity
vromero
parents:
21718
diff
changeset
|
4362 |
return ((AmbiguityError)sym.baseSymbol()).ambiguousSyms; |
15038 | 4363 |
} else { |
4364 |
return List.of(sym); |
|
4365 |
} |
|
4366 |
} |
|
4367 |
||
4368 |
AmbiguityError addAmbiguousSymbol(Symbol s) { |
|
4369 |
ambiguousSyms = ambiguousSyms.prepend(s); |
|
4370 |
return this; |
|
10 | 4371 |
} |
4372 |
||
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4373 |
@Override |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4374 |
JCDiagnostic getDiagnostic(JCDiagnostic.DiagnosticType dkind, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4375 |
DiagnosticPosition pos, |
8045 | 4376 |
Symbol location, |
3143
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4377 |
Type site, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4378 |
Name name, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4379 |
List<Type> argtypes, |
0413d5b5b7fd
6822637: ResolveError hierarchy needs to be refactored
mcimadamore
parents:
3140
diff
changeset
|
4380 |
List<Type> typeargtypes) { |
15038 | 4381 |
List<Symbol> diagSyms = ambiguousSyms.reverse(); |
4382 |
Symbol s1 = diagSyms.head; |
|
4383 |
Symbol s2 = diagSyms.tail.head; |
|
4384 |
Name sname = s1.name; |
|
4385 |
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
|
4386 |
return diags.create(dkind, log.currentSource(), |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4387 |
pos, "ref.ambiguous", sname, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4388 |
kindName(s1), |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4389 |
s1, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4390 |
s1.location(site, types), |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4391 |
kindName(s2), |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4392 |
s2, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4393 |
s2.location(site, types)); |
15038 | 4394 |
} |
4395 |
||
4396 |
/** |
|
4397 |
* If multiple applicable methods are found during overload and none of them |
|
4398 |
* is more specific than the others, attempt to merge their signatures. |
|
4399 |
*/ |
|
4400 |
Symbol mergeAbstracts(Type site) { |
|
18668
1f99c1b43ab2
7034798: Ambiguity error for abstract method call is too eager
mcimadamore
parents:
18646
diff
changeset
|
4401 |
List<Symbol> ambiguousInOrder = ambiguousSyms.reverse(); |
41526
265017792980
8167000: Refine handling of multiple maximally specific abstract methods
mcimadamore
parents:
39599
diff
changeset
|
4402 |
return types.mergeAbstracts(ambiguousInOrder, site, true).orElse(this); |
15038 | 4403 |
} |
4404 |
||
4405 |
@Override |
|
4406 |
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
|
4407 |
Symbol firstAmbiguity = ambiguousSyms.last(); |
f564dcca5525
8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents:
15360
diff
changeset
|
4408 |
return firstAmbiguity.kind == TYP ? |
f564dcca5525
8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
mcimadamore
parents:
15360
diff
changeset
|
4409 |
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
|
4410 |
firstAmbiguity; |
10 | 4411 |
} |
4412 |
} |
|
1533
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4413 |
|
16312
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4414 |
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
|
4415 |
|
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4416 |
ResolveError delegatedError; |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4417 |
|
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4418 |
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
|
4419 |
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
|
4420 |
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
|
4421 |
} |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4422 |
|
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4423 |
@Override |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
4424 |
public Symbol baseSymbol() { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
4425 |
return delegatedError.baseSymbol(); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
4426 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
4427 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
4428 |
@Override |
16312
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4429 |
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
|
4430 |
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
|
4431 |
} |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4432 |
|
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4433 |
@Override |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4434 |
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
|
4435 |
return true; |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4436 |
} |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4437 |
|
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4438 |
@Override |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4439 |
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
|
4440 |
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
|
4441 |
} |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4442 |
} |
7fb570abcb54
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
mcimadamore
parents:
16301
diff
changeset
|
4443 |
|
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4444 |
/** |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4445 |
* BadMethodReferenceError error class indicating that a method reference symbol has been found, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4446 |
* but with the wrong staticness. |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4447 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4448 |
class BadMethodReferenceError extends StaticError { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4449 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4450 |
boolean unboundLookup; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4451 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4452 |
public BadMethodReferenceError(Symbol sym, boolean unboundLookup) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4453 |
super(sym); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4454 |
this.unboundLookup = unboundLookup; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4455 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4456 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4457 |
@Override |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4458 |
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
|
4459 |
final String key; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4460 |
if (!unboundLookup) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4461 |
key = "bad.static.method.in.bound.lookup"; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4462 |
} else if (sym.isStatic()) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4463 |
key = "bad.static.method.in.unbound.lookup"; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4464 |
} else { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4465 |
key = "bad.instance.method.in.unbound.lookup"; |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4466 |
} |
29774
9d438163db79
8075184: javac is mistakenly considering an missing enclosing instance error as an overload error
vromero
parents:
29554
diff
changeset
|
4467 |
return sym.kind.isResolutionError() ? |
28456
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4468 |
((ResolveError)sym).getDiagnostic(dkind, pos, location, site, name, argtypes, typeargtypes) : |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4469 |
diags.create(dkind, log.currentSource(), pos, key, Kinds.kindName(sym), sym); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4470 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4471 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4472 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4473 |
/** |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4474 |
* BadConstructorReferenceError error class indicating that a constructor reference symbol has been found, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4475 |
* 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
|
4476 |
*/ |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4477 |
class BadConstructorReferenceError extends InvalidSymbolError { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4478 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4479 |
public BadConstructorReferenceError(Symbol sym) { |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4480 |
super(MISSING_ENCL, sym, "BadConstructorReferenceError"); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4481 |
} |
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 |
@Override |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4484 |
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
|
4485 |
return diags.create(dkind, log.currentSource(), pos, |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4486 |
"cant.access.inner.cls.constr", site.tsym.name, argtypes, site.getEnclosingType()); |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4487 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4488 |
} |
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4489 |
|
b87fdde1404d
8068995: Cleanup method reference lookup code
mcimadamore
parents:
28336
diff
changeset
|
4490 |
/** |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4491 |
* Helper class for method resolution diagnostic simplification. |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4492 |
* 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
|
4493 |
* 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
|
4494 |
* 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
|
4495 |
* 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
|
4496 |
* 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
|
4497 |
* 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
|
4498 |
* 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
|
4499 |
* the diagnostic to a simpler one. |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4500 |
*/ |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4501 |
static class MethodResolutionDiagHelper { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4502 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4503 |
/** |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4504 |
* 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
|
4505 |
* into a simpler one |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4506 |
*/ |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4507 |
interface DiagnosticRewriter { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4508 |
JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags, |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4509 |
DiagnosticPosition preferedPos, DiagnosticSource preferredSource, |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4510 |
DiagnosticType preferredKind, JCDiagnostic d); |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4511 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4512 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4513 |
/** |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4514 |
* 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
|
4515 |
* 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
|
4516 |
* for matching diagnostic arguments. |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4517 |
*/ |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4518 |
static class Template { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4519 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4520 |
/** regex used to match diag key */ |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4521 |
String regex; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4522 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4523 |
/** templates used to match diagnostic args */ |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4524 |
Template[] subTemplates; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4525 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4526 |
Template(String key, Template... subTemplates) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4527 |
this.regex = key; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4528 |
this.subTemplates = subTemplates; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4529 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4530 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4531 |
/** |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4532 |
* 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
|
4533 |
* 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
|
4534 |
*/ |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4535 |
boolean matches(Object o) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4536 |
JCDiagnostic d = (JCDiagnostic)o; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4537 |
Object[] args = d.getArgs(); |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4538 |
if (!d.getCode().matches(regex) || |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4539 |
subTemplates.length != d.getArgs().length) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4540 |
return false; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4541 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4542 |
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
|
4543 |
if (!subTemplates[i].matches(args[i])) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4544 |
return false; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4545 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4546 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4547 |
return true; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4548 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4549 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4550 |
|
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4551 |
/** |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4552 |
* Common rewriter for all argument mismatch simplifications. |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4553 |
*/ |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4554 |
static class ArgMismatchRewriter implements DiagnosticRewriter { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4555 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4556 |
/** the index of the subdiagnostic to be used as primary. */ |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4557 |
int causeIndex; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4558 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4559 |
public ArgMismatchRewriter(int causeIndex) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4560 |
this.causeIndex = causeIndex; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4561 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4562 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4563 |
@Override |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4564 |
public JCDiagnostic rewriteDiagnostic(JCDiagnostic.Factory diags, |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4565 |
DiagnosticPosition preferedPos, DiagnosticSource preferredSource, |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4566 |
DiagnosticType preferredKind, JCDiagnostic d) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4567 |
JCDiagnostic cause = (JCDiagnostic)d.getArgs()[causeIndex]; |
34854
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
4568 |
DiagnosticPosition pos = d.getDiagnosticPosition(); |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
4569 |
if (pos == null) { |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
4570 |
pos = preferedPos; |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
4571 |
} |
d90aa0a83be4
8145466: javac: No line numbers in compilation error
sadayapalam
parents:
34566
diff
changeset
|
4572 |
return diags.create(preferredKind, preferredSource, pos, |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4573 |
"prob.found.req", cause); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4574 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4575 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4576 |
|
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4577 |
/** 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
|
4578 |
static final Template skip = new Template("") { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4579 |
@Override |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4580 |
boolean matches(Object d) { |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4581 |
return true; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4582 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4583 |
}; |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4584 |
|
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4585 |
/** template for matching inference-free arguments mismatch failures */ |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4586 |
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
|
4587 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4588 |
/** template for matching inference related arguments mismatch failures */ |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4589 |
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
|
4590 |
@Override |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4591 |
boolean matches(Object o) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4592 |
if (!super.matches(o)) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4593 |
return false; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4594 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4595 |
JCDiagnostic d = (JCDiagnostic)o; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4596 |
@SuppressWarnings("unchecked") |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4597 |
List<Type> tvars = (List<Type>)d.getArgs()[0]; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4598 |
return !containsAny(d, tvars); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4599 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4600 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4601 |
BiPredicate<Object, List<Type>> containsPredicate = (o, ts) -> { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4602 |
if (o instanceof Type) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4603 |
return ((Type)o).containsAny(ts); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4604 |
} else if (o instanceof JCDiagnostic) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4605 |
return containsAny((JCDiagnostic)o, ts); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4606 |
} else { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4607 |
return false; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4608 |
} |
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 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4611 |
boolean containsAny(JCDiagnostic d, List<Type> ts) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4612 |
return Stream.of(d.getArgs()) |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4613 |
.anyMatch(o -> containsPredicate.test(o, ts)); |
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 |
}; |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4616 |
|
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4617 |
/** rewriter map used for method resolution simplification */ |
22163 | 4618 |
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
|
4619 |
|
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4620 |
static { |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4621 |
rewriters.put(argMismatchTemplate, new ArgMismatchRewriter(0)); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4622 |
rewriters.put(inferArgMismatchTemplate, new ArgMismatchRewriter(1)); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4623 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4624 |
|
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4625 |
/** |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4626 |
* 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
|
4627 |
* and rewrite it accordingly. |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4628 |
*/ |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4629 |
static JCDiagnostic rewrite(JCDiagnostic.Factory diags, DiagnosticPosition pos, DiagnosticSource source, |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4630 |
DiagnosticType dkind, JCDiagnostic d) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4631 |
for (Map.Entry<Template, DiagnosticRewriter> _entry : rewriters.entrySet()) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4632 |
if (_entry.getKey().matches(d)) { |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4633 |
JCDiagnostic simpleDiag = |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4634 |
_entry.getValue().rewriteDiagnostic(diags, pos, source, dkind, d); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4635 |
simpleDiag.setFlag(DiagnosticFlag.COMPRESSED); |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4636 |
return simpleDiag; |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4637 |
} |
28331
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4638 |
} |
43ed6b2e0e3b
8067883: Javac misses some opportunities for diagnostic simplification
mcimadamore
parents:
27849
diff
changeset
|
4639 |
return null; |
17582
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4640 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4641 |
} |
4079713129dd
8012003: Method diagnostics resolution need to be simplified in some cases
mcimadamore
parents:
16975
diff
changeset
|
4642 |
|
1533
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4643 |
enum MethodResolutionPhase { |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4644 |
BASIC(false, false), |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4645 |
BOX(true, false), |
14444 | 4646 |
VARARITY(true, true) { |
4647 |
@Override |
|
4648 |
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
|
4649 |
//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
|
4650 |
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
|
4651 |
if (!sym.kind.isResolutionError()) { |
26533
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4652 |
//varargs resolution successful |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4653 |
return sym; |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4654 |
} else { |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4655 |
//pick best error |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4656 |
switch (bestSoFar.kind) { |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4657 |
case WRONG_MTH: |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4658 |
case WRONG_MTHS: |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4659 |
//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
|
4660 |
//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
|
4661 |
//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
|
4662 |
//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
|
4663 |
switch (sym.kind) { |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4664 |
case WRONG_MTH: |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4665 |
//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
|
4666 |
//result instead |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4667 |
return bestSoFar.kind == WRONG_MTHS ? |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4668 |
bestSoFar : sym; |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4669 |
case ABSENT_MTH: |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4670 |
//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
|
4671 |
//match any method |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4672 |
return bestSoFar; |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4673 |
case WRONG_MTHS: |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4674 |
default: |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4675 |
//safe to override |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4676 |
return sym; |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4677 |
} |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4678 |
default: |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4679 |
//otherwise, return first error |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4680 |
return bestSoFar; |
8fba085fbdbf
8055514: Wrong, confusing error when non-static varargs referenced in static context
mcimadamore
parents:
26266
diff
changeset
|
4681 |
} |
14444 | 4682 |
} |
4683 |
} |
|
4684 |
}; |
|
1533
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4685 |
|
14801
d66cab4ef397
8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents:
14724
diff
changeset
|
4686 |
final boolean isBoxingRequired; |
d66cab4ef397
8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents:
14724
diff
changeset
|
4687 |
final boolean isVarargsRequired; |
1533
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4688 |
|
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4689 |
MethodResolutionPhase(boolean isBoxingRequired, boolean isVarargsRequired) { |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4690 |
this.isBoxingRequired = isBoxingRequired; |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4691 |
this.isVarargsRequired = isVarargsRequired; |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4692 |
} |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4693 |
|
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4694 |
public boolean isBoxingRequired() { |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4695 |
return isBoxingRequired; |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4696 |
} |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4697 |
|
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4698 |
public boolean isVarargsRequired() { |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4699 |
return isVarargsRequired; |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4700 |
} |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4701 |
|
14444 | 4702 |
public Symbol mergeResults(Symbol prev, Symbol sym) { |
4703 |
return sym; |
|
4704 |
} |
|
1533
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4705 |
} |
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4706 |
|
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4707 |
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
|
4708 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4709 |
/** |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4710 |
* 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
|
4711 |
* overload resolution, such as list of method that are not applicable |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4712 |
* (used to generate more precise diagnostics) and so on. Resolution contexts |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4713 |
* 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
|
4714 |
* work within the resolution context it created. |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4715 |
*/ |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4716 |
class MethodResolutionContext { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4717 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4718 |
private List<Candidate> candidates = List.nil(); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4719 |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4720 |
MethodResolutionPhase step = null; |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4721 |
|
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
4722 |
MethodCheck methodCheck = resolveMethodCheck; |
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16323
diff
changeset
|
4723 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4724 |
private boolean internalResolution = false; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4725 |
private DeferredAttr.AttrMode attrMode = DeferredAttr.AttrMode.SPECULATIVE; |
6710
b14e6fe7b290
5088624: cannot find symbol message should be more intelligent
mcimadamore
parents:
6592
diff
changeset
|
4726 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4727 |
void addInapplicableCandidate(Symbol sym, JCDiagnostic details) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4728 |
Candidate c = new Candidate(currentResolutionContext.step, sym, details, null); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
4729 |
candidates = candidates.append(c); |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4730 |
} |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4731 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4732 |
void addApplicableCandidate(Symbol sym, Type mtype) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4733 |
Candidate c = new Candidate(currentResolutionContext.step, sym, null, mtype); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4734 |
candidates = candidates.append(c); |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4735 |
} |
10816
ce8a7e9d8882
7098660: Write better overload resolution/inference tests
mcimadamore
parents:
10812
diff
changeset
|
4736 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
4737 |
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
|
4738 |
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
|
4739 |
? deferredAttr.emptyDeferredAttrContext |
00a059740d87
8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents:
23105
diff
changeset
|
4740 |
: pendingResult.checkContext.deferredAttrContext(); |
00a059740d87
8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
vromero
parents:
23105
diff
changeset
|
4741 |
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
|
4742 |
inferenceContext, parent, warn); |
15037
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
4743 |
} |
8ba16ac61b1a
8005243: Restructure method check code to allow pluggable checkers
mcimadamore
parents:
14957
diff
changeset
|
4744 |
|
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4745 |
/** |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4746 |
* This class represents an overload resolution candidate. There are two |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4747 |
* kinds of candidates: applicable methods and inapplicable methods; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4748 |
* applicable methods have a pointer to the instantiated method type, |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4749 |
* while inapplicable candidates contain further details about the |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4750 |
* reason why the method has been considered inapplicable. |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4751 |
*/ |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16294
diff
changeset
|
4752 |
@SuppressWarnings("overrides") |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4753 |
class Candidate { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4754 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4755 |
final MethodResolutionPhase step; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4756 |
final Symbol sym; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4757 |
final JCDiagnostic details; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4758 |
final Type mtype; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4759 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4760 |
private Candidate(MethodResolutionPhase step, Symbol sym, JCDiagnostic details, Type mtype) { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4761 |
this.step = step; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4762 |
this.sym = sym; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4763 |
this.details = details; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4764 |
this.mtype = mtype; |
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 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4767 |
boolean isApplicable() { |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4768 |
return mtype != null; |
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4769 |
} |
1533
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4770 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4771 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4772 |
DeferredAttr.AttrMode attrMode() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4773 |
return attrMode; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4774 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4775 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4776 |
boolean internal() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4777 |
return internalResolution; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14056
diff
changeset
|
4778 |
} |
1533
6a9a2f681d24
6746184: javac fails to compile call to public varargs method
mcimadamore
parents:
1529
diff
changeset
|
4779 |
} |
12076
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4780 |
|
1b7560bd1760
7132880: Resolve should support nested resolution contexts
mcimadamore
parents:
11707
diff
changeset
|
4781 |
MethodResolutionContext currentResolutionContext = null; |
10 | 4782 |
} |