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