author | chegar |
Wed, 19 Jun 2013 11:48:05 +0100 | |
changeset 18412 | d0e713f5cabd |
parent 18395 | d56a5fbf0b32 |
child 18413 | 5052b6314aad |
permissions | -rw-r--r-- |
10 | 1 |
/* |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2 |
* Copyright (c) 1999, 2013, 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 |
||
28 |
import java.util.*; |
|
15385 | 29 |
|
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
30 |
import javax.tools.JavaFileManager; |
10 | 31 |
|
32 |
import com.sun.tools.javac.code.*; |
|
33 |
import com.sun.tools.javac.jvm.*; |
|
34 |
import com.sun.tools.javac.tree.*; |
|
35 |
import com.sun.tools.javac.util.*; |
|
36 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
|
37 |
import com.sun.tools.javac.util.List; |
|
38 |
||
39 |
import com.sun.tools.javac.code.Lint; |
|
40 |
import com.sun.tools.javac.code.Lint.LintCategory; |
|
41 |
import com.sun.tools.javac.code.Type.*; |
|
42 |
import com.sun.tools.javac.code.Symbol.*; |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
43 |
import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext; |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
44 |
import com.sun.tools.javac.comp.Infer.InferenceContext; |
15705 | 45 |
import com.sun.tools.javac.comp.Infer.FreeTypeListener; |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15361
diff
changeset
|
46 |
import com.sun.tools.javac.tree.JCTree.*; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15361
diff
changeset
|
47 |
import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*; |
10 | 48 |
|
49 |
import static com.sun.tools.javac.code.Flags.*; |
|
10950 | 50 |
import static com.sun.tools.javac.code.Flags.ANNOTATION; |
51 |
import static com.sun.tools.javac.code.Flags.SYNCHRONIZED; |
|
10 | 52 |
import static com.sun.tools.javac.code.Kinds.*; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
53 |
import static com.sun.tools.javac.code.TypeTag.*; |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
54 |
import static com.sun.tools.javac.code.TypeTag.WILDCARD; |
10 | 55 |
|
10950 | 56 |
import static com.sun.tools.javac.tree.JCTree.Tag.*; |
6721 | 57 |
|
10 | 58 |
/** Type checking helper class for the attribution phase. |
59 |
* |
|
5847
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5846
diff
changeset
|
60 |
* <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
|
61 |
* If you write code that depends on this, you do so at your own risk. |
10 | 62 |
* This code and its internal interfaces are subject to change or |
63 |
* deletion without notice.</b> |
|
64 |
*/ |
|
65 |
public class Check { |
|
66 |
protected static final Context.Key<Check> checkKey = |
|
67 |
new Context.Key<Check>(); |
|
68 |
||
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
69 |
private final Names names; |
10 | 70 |
private final Log log; |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
71 |
private final Resolve rs; |
10 | 72 |
private final Symtab syms; |
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
73 |
private final Enter enter; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
74 |
private final DeferredAttr deferredAttr; |
10 | 75 |
private final Infer infer; |
76 |
private final Types types; |
|
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
77 |
private final JCDiagnostic.Factory diags; |
3557
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
78 |
private boolean warnOnSyntheticConflicts; |
5842
714e365b4b1b
6955264: add option to suppress Abort in Check.completionError
jjg
parents:
5654
diff
changeset
|
79 |
private boolean suppressAbortOnBadClassFile; |
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
80 |
private boolean enableSunApiLintControl; |
10 | 81 |
private final TreeInfo treeinfo; |
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
82 |
private final JavaFileManager fileManager; |
15724 | 83 |
private final Profile profile; |
10 | 84 |
|
85 |
// The set of lint options currently in effect. It is initialized |
|
86 |
// from the context, and then is set/reset as needed by Attr as it |
|
87 |
// visits all the various parts of the trees during attribution. |
|
88 |
private Lint lint; |
|
89 |
||
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
90 |
// The method being analyzed in Attr - it is set/reset as needed by |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
91 |
// Attr as it visits new method declarations. |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
92 |
private MethodSymbol method; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
93 |
|
10 | 94 |
public static Check instance(Context context) { |
95 |
Check instance = context.get(checkKey); |
|
96 |
if (instance == null) |
|
97 |
instance = new Check(context); |
|
98 |
return instance; |
|
99 |
} |
|
100 |
||
101 |
protected Check(Context context) { |
|
102 |
context.put(checkKey, this); |
|
103 |
||
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
104 |
names = Names.instance(context); |
15385 | 105 |
dfltTargetMeta = new Name[] { names.PACKAGE, names.TYPE, |
106 |
names.FIELD, names.METHOD, names.CONSTRUCTOR, |
|
107 |
names.ANNOTATION_TYPE, names.LOCAL_VARIABLE, names.PARAMETER}; |
|
10 | 108 |
log = Log.instance(context); |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
109 |
rs = Resolve.instance(context); |
10 | 110 |
syms = Symtab.instance(context); |
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
111 |
enter = Enter.instance(context); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
112 |
deferredAttr = DeferredAttr.instance(context); |
10 | 113 |
infer = Infer.instance(context); |
15724 | 114 |
types = Types.instance(context); |
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
115 |
diags = JCDiagnostic.Factory.instance(context); |
10 | 116 |
Options options = Options.instance(context); |
117 |
lint = Lint.instance(context); |
|
118 |
treeinfo = TreeInfo.instance(context); |
|
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
119 |
fileManager = context.get(JavaFileManager.class); |
10 | 120 |
|
121 |
Source source = Source.instance(context); |
|
122 |
allowGenerics = source.allowGenerics(); |
|
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
123 |
allowVarargs = source.allowVarargs(); |
10 | 124 |
allowAnnotations = source.allowAnnotations(); |
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
125 |
allowCovariantReturns = source.allowCovariantReturns(); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
126 |
allowSimplifiedVarargs = source.allowSimplifiedVarargs(); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
127 |
allowDefaultMethods = source.allowDefaultMethods(); |
14547 | 128 |
allowStrictMethodClashCheck = source.allowStrictMethodClashCheck(); |
11314 | 129 |
complexInference = options.isSet("complexinference"); |
6721 | 130 |
warnOnSyntheticConflicts = options.isSet("warnOnSyntheticConflicts"); |
131 |
suppressAbortOnBadClassFile = options.isSet("suppressAbortOnBadClassFile"); |
|
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
132 |
enableSunApiLintControl = options.isSet("enableSunApiLintControl"); |
10 | 133 |
|
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
134 |
Target target = Target.instance(context); |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
135 |
syntheticNameChar = target.syntheticNameChar(); |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
136 |
|
15724 | 137 |
profile = Profile.instance(context); |
138 |
||
10 | 139 |
boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION); |
140 |
boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED); |
|
3661 | 141 |
boolean verboseSunApi = lint.isEnabled(LintCategory.SUNAPI); |
813 | 142 |
boolean enforceMandatoryWarnings = source.enforceMandatoryWarnings(); |
10 | 143 |
|
813 | 144 |
deprecationHandler = new MandatoryWarningHandler(log, verboseDeprecated, |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
145 |
enforceMandatoryWarnings, "deprecated", LintCategory.DEPRECATION); |
813 | 146 |
uncheckedHandler = new MandatoryWarningHandler(log, verboseUnchecked, |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
147 |
enforceMandatoryWarnings, "unchecked", LintCategory.UNCHECKED); |
3661 | 148 |
sunApiHandler = new MandatoryWarningHandler(log, verboseSunApi, |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
149 |
enforceMandatoryWarnings, "sunapi", null); |
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
150 |
|
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
151 |
deferredLintHandler = DeferredLintHandler.immediateHandler; |
10 | 152 |
} |
153 |
||
154 |
/** Switch: generics enabled? |
|
155 |
*/ |
|
156 |
boolean allowGenerics; |
|
157 |
||
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
158 |
/** Switch: varargs enabled? |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
159 |
*/ |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
160 |
boolean allowVarargs; |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
161 |
|
10 | 162 |
/** Switch: annotations enabled? |
163 |
*/ |
|
164 |
boolean allowAnnotations; |
|
165 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
166 |
/** Switch: covariant returns enabled? |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
167 |
*/ |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
168 |
boolean allowCovariantReturns; |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
169 |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
170 |
/** Switch: simplified varargs enabled? |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
171 |
*/ |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
172 |
boolean allowSimplifiedVarargs; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
173 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
174 |
/** Switch: default methods enabled? |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
175 |
*/ |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
176 |
boolean allowDefaultMethods; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
177 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
178 |
/** Switch: should unrelated return types trigger a method clash? |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
179 |
*/ |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
180 |
boolean allowStrictMethodClashCheck; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
181 |
|
10 | 182 |
/** Switch: -complexinference option set? |
183 |
*/ |
|
184 |
boolean complexInference; |
|
185 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
186 |
/** Character for synthetic names |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
187 |
*/ |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
188 |
char syntheticNameChar; |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
189 |
|
10 | 190 |
/** A table mapping flat names of all compiled classes in this run to their |
191 |
* symbols; maintained from outside. |
|
192 |
*/ |
|
193 |
public Map<Name,ClassSymbol> compiled = new HashMap<Name, ClassSymbol>(); |
|
194 |
||
195 |
/** A handler for messages about deprecated usage. |
|
196 |
*/ |
|
197 |
private MandatoryWarningHandler deprecationHandler; |
|
198 |
||
199 |
/** A handler for messages about unchecked or unsafe usage. |
|
200 |
*/ |
|
201 |
private MandatoryWarningHandler uncheckedHandler; |
|
202 |
||
5848
c5a4ce47e780
6960407: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5847
diff
changeset
|
203 |
/** A handler for messages about using proprietary API. |
3661 | 204 |
*/ |
205 |
private MandatoryWarningHandler sunApiHandler; |
|
10 | 206 |
|
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
207 |
/** A handler for deferred lint warnings. |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
208 |
*/ |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
209 |
private DeferredLintHandler deferredLintHandler; |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
210 |
|
10 | 211 |
/* ************************************************************************* |
212 |
* Errors and Warnings |
|
213 |
**************************************************************************/ |
|
214 |
||
215 |
Lint setLint(Lint newLint) { |
|
216 |
Lint prev = lint; |
|
217 |
lint = newLint; |
|
218 |
return prev; |
|
219 |
} |
|
220 |
||
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
221 |
DeferredLintHandler setDeferredLintHandler(DeferredLintHandler newDeferredLintHandler) { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
222 |
DeferredLintHandler prev = deferredLintHandler; |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
223 |
deferredLintHandler = newDeferredLintHandler; |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
224 |
return prev; |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
225 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
226 |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
227 |
MethodSymbol setMethod(MethodSymbol newMethod) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
228 |
MethodSymbol prev = method; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
229 |
method = newMethod; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
230 |
return prev; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
231 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
232 |
|
10 | 233 |
/** Warn about deprecated symbol. |
234 |
* @param pos Position to be used for error reporting. |
|
235 |
* @param sym The deprecated symbol. |
|
236 |
*/ |
|
237 |
void warnDeprecated(DiagnosticPosition pos, Symbol sym) { |
|
238 |
if (!lint.isSuppressed(LintCategory.DEPRECATION)) |
|
239 |
deprecationHandler.report(pos, "has.been.deprecated", sym, sym.location()); |
|
240 |
} |
|
241 |
||
242 |
/** Warn about unchecked operation. |
|
243 |
* @param pos Position to be used for error reporting. |
|
244 |
* @param msg A string describing the problem. |
|
245 |
*/ |
|
246 |
public void warnUnchecked(DiagnosticPosition pos, String msg, Object... args) { |
|
247 |
if (!lint.isSuppressed(LintCategory.UNCHECKED)) |
|
248 |
uncheckedHandler.report(pos, msg, args); |
|
249 |
} |
|
250 |
||
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
251 |
/** Warn about unsafe vararg method decl. |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
252 |
* @param pos Position to be used for error reporting. |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
253 |
*/ |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
254 |
void warnUnsafeVararg(DiagnosticPosition pos, String key, Object... args) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
255 |
if (lint.isEnabled(LintCategory.VARARGS) && allowSimplifiedVarargs) |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
256 |
log.warning(LintCategory.VARARGS, pos, key, args); |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
257 |
} |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
258 |
|
5848
c5a4ce47e780
6960407: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5847
diff
changeset
|
259 |
/** Warn about using proprietary API. |
3661 | 260 |
* @param pos Position to be used for error reporting. |
261 |
* @param msg A string describing the problem. |
|
262 |
*/ |
|
263 |
public void warnSunApi(DiagnosticPosition pos, String msg, Object... args) { |
|
264 |
if (!lint.isSuppressed(LintCategory.SUNAPI)) |
|
265 |
sunApiHandler.report(pos, msg, args); |
|
266 |
} |
|
267 |
||
5002
12a9e8562200
4880220: Add a warning when accessing a static method via an reference
jjg
parents:
4867
diff
changeset
|
268 |
public void warnStatic(DiagnosticPosition pos, String msg, Object... args) { |
12a9e8562200
4880220: Add a warning when accessing a static method via an reference
jjg
parents:
4867
diff
changeset
|
269 |
if (lint.isEnabled(LintCategory.STATIC)) |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
270 |
log.warning(LintCategory.STATIC, pos, msg, args); |
5002
12a9e8562200
4880220: Add a warning when accessing a static method via an reference
jjg
parents:
4867
diff
changeset
|
271 |
} |
12a9e8562200
4880220: Add a warning when accessing a static method via an reference
jjg
parents:
4867
diff
changeset
|
272 |
|
10 | 273 |
/** |
274 |
* Report any deferred diagnostics. |
|
275 |
*/ |
|
276 |
public void reportDeferredDiagnostics() { |
|
277 |
deprecationHandler.reportDeferredDiagnostic(); |
|
278 |
uncheckedHandler.reportDeferredDiagnostic(); |
|
3661 | 279 |
sunApiHandler.reportDeferredDiagnostic(); |
10 | 280 |
} |
281 |
||
282 |
||
283 |
/** Report a failure to complete a class. |
|
284 |
* @param pos Position to be used for error reporting. |
|
285 |
* @param ex The failure to report. |
|
286 |
*/ |
|
287 |
public Type completionError(DiagnosticPosition pos, CompletionFailure ex) { |
|
16326
9b94bafef533
8009227: Certain diagnostics should not be deferred
mcimadamore
parents:
16320
diff
changeset
|
288 |
log.error(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE, pos, "cant.access", ex.sym, ex.getDetailValue()); |
5842
714e365b4b1b
6955264: add option to suppress Abort in Check.completionError
jjg
parents:
5654
diff
changeset
|
289 |
if (ex instanceof ClassReader.BadClassFile |
714e365b4b1b
6955264: add option to suppress Abort in Check.completionError
jjg
parents:
5654
diff
changeset
|
290 |
&& !suppressAbortOnBadClassFile) throw new Abort(); |
10 | 291 |
else return syms.errType; |
292 |
} |
|
293 |
||
294 |
/** Report an error that wrong type tag was found. |
|
295 |
* @param pos Position to be used for error reporting. |
|
296 |
* @param required An internationalized string describing the type tag |
|
297 |
* required. |
|
298 |
* @param found The type that was found. |
|
299 |
*/ |
|
300 |
Type typeTagError(DiagnosticPosition pos, Object required, Object found) { |
|
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
301 |
// this error used to be raised by the parser, |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
302 |
// but has been delayed to this point: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
303 |
if (found instanceof Type && ((Type)found).hasTag(VOID)) { |
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
304 |
log.error(pos, "illegal.start.of.type"); |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
305 |
return syms.errType; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
306 |
} |
10 | 307 |
log.error(pos, "type.found.req", found, required); |
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
308 |
return types.createErrorType(found instanceof Type ? (Type)found : syms.errType); |
10 | 309 |
} |
310 |
||
311 |
/** Report an error that symbol cannot be referenced before super |
|
312 |
* has been called. |
|
313 |
* @param pos Position to be used for error reporting. |
|
314 |
* @param sym The referenced symbol. |
|
315 |
*/ |
|
316 |
void earlyRefError(DiagnosticPosition pos, Symbol sym) { |
|
317 |
log.error(pos, "cant.ref.before.ctor.called", sym); |
|
318 |
} |
|
319 |
||
320 |
/** Report duplicate declaration error. |
|
321 |
*/ |
|
322 |
void duplicateError(DiagnosticPosition pos, Symbol sym) { |
|
323 |
if (!sym.type.isErroneous()) { |
|
10626
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
324 |
Symbol location = sym.location(); |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
325 |
if (location.kind == MTH && |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
326 |
((MethodSymbol)location).isStaticOrInstanceInit()) { |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
327 |
log.error(pos, "already.defined.in.clinit", kindName(sym), sym, |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
328 |
kindName(sym.location()), kindName(sym.location().enclClass()), |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
329 |
sym.location().enclClass()); |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
330 |
} else { |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
331 |
log.error(pos, "already.defined", kindName(sym), sym, |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
332 |
kindName(sym.location()), sym.location()); |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
333 |
} |
10 | 334 |
} |
335 |
} |
|
336 |
||
337 |
/** Report array/varargs duplicate declaration |
|
338 |
*/ |
|
339 |
void varargsDuplicateError(DiagnosticPosition pos, Symbol sym1, Symbol sym2) { |
|
340 |
if (!sym1.type.isErroneous() && !sym2.type.isErroneous()) { |
|
341 |
log.error(pos, "array.and.varargs", sym1, sym2, sym2.location()); |
|
342 |
} |
|
343 |
} |
|
344 |
||
345 |
/* ************************************************************************ |
|
346 |
* duplicate declaration checking |
|
347 |
*************************************************************************/ |
|
348 |
||
349 |
/** Check that variable does not hide variable with same name in |
|
350 |
* immediately enclosing local scope. |
|
351 |
* @param pos Position for error reporting. |
|
352 |
* @param v The symbol. |
|
353 |
* @param s The scope. |
|
354 |
*/ |
|
355 |
void checkTransparentVar(DiagnosticPosition pos, VarSymbol v, Scope s) { |
|
356 |
if (s.next != null) { |
|
357 |
for (Scope.Entry e = s.next.lookup(v.name); |
|
358 |
e.scope != null && e.sym.owner == v.owner; |
|
359 |
e = e.next()) { |
|
360 |
if (e.sym.kind == VAR && |
|
361 |
(e.sym.owner.kind & (VAR | MTH)) != 0 && |
|
362 |
v.name != names.error) { |
|
363 |
duplicateError(pos, e.sym); |
|
364 |
return; |
|
365 |
} |
|
366 |
} |
|
367 |
} |
|
368 |
} |
|
369 |
||
370 |
/** Check that a class or interface does not hide a class or |
|
371 |
* interface with same name in immediately enclosing local scope. |
|
372 |
* @param pos Position for error reporting. |
|
373 |
* @param c The symbol. |
|
374 |
* @param s The scope. |
|
375 |
*/ |
|
376 |
void checkTransparentClass(DiagnosticPosition pos, ClassSymbol c, Scope s) { |
|
377 |
if (s.next != null) { |
|
378 |
for (Scope.Entry e = s.next.lookup(c.name); |
|
379 |
e.scope != null && e.sym.owner == c.owner; |
|
380 |
e = e.next()) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
381 |
if (e.sym.kind == TYP && !e.sym.type.hasTag(TYPEVAR) && |
10 | 382 |
(e.sym.owner.kind & (VAR | MTH)) != 0 && |
383 |
c.name != names.error) { |
|
384 |
duplicateError(pos, e.sym); |
|
385 |
return; |
|
386 |
} |
|
387 |
} |
|
388 |
} |
|
389 |
} |
|
390 |
||
391 |
/** Check that class does not have the same name as one of |
|
392 |
* its enclosing classes, or as a class defined in its enclosing scope. |
|
393 |
* return true if class is unique in its enclosing scope. |
|
394 |
* @param pos Position for error reporting. |
|
395 |
* @param name The class name. |
|
396 |
* @param s The enclosing scope. |
|
397 |
*/ |
|
398 |
boolean checkUniqueClassName(DiagnosticPosition pos, Name name, Scope s) { |
|
399 |
for (Scope.Entry e = s.lookup(name); e.scope == s; e = e.next()) { |
|
400 |
if (e.sym.kind == TYP && e.sym.name != names.error) { |
|
401 |
duplicateError(pos, e.sym); |
|
402 |
return false; |
|
403 |
} |
|
404 |
} |
|
405 |
for (Symbol sym = s.owner; sym != null; sym = sym.owner) { |
|
406 |
if (sym.kind == TYP && sym.name == name && sym.name != names.error) { |
|
407 |
duplicateError(pos, sym); |
|
408 |
return true; |
|
409 |
} |
|
410 |
} |
|
411 |
return true; |
|
412 |
} |
|
413 |
||
414 |
/* ************************************************************************* |
|
415 |
* Class name generation |
|
416 |
**************************************************************************/ |
|
417 |
||
418 |
/** Return name of local class. |
|
14259 | 419 |
* This is of the form {@code <enclClass> $ n <classname> } |
10 | 420 |
* where |
421 |
* enclClass is the flat name of the enclosing class, |
|
422 |
* classname is the simple name of the local class |
|
423 |
*/ |
|
424 |
Name localClassName(ClassSymbol c) { |
|
425 |
for (int i=1; ; i++) { |
|
426 |
Name flatname = names. |
|
427 |
fromString("" + c.owner.enclClass().flatname + |
|
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
428 |
syntheticNameChar + i + |
10 | 429 |
c.name); |
430 |
if (compiled.get(flatname) == null) return flatname; |
|
431 |
} |
|
432 |
} |
|
433 |
||
434 |
/* ************************************************************************* |
|
435 |
* Type Checking |
|
436 |
**************************************************************************/ |
|
437 |
||
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
438 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
439 |
* A check context is an object that can be used to perform compatibility |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
440 |
* checks - depending on the check context, meaning of 'compatibility' might |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
441 |
* vary significantly. |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
442 |
*/ |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
443 |
public interface CheckContext { |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
444 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
445 |
* Is type 'found' compatible with type 'req' in given context |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
446 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
447 |
boolean compatible(Type found, Type req, Warner warn); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
448 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
449 |
* Report a check error |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
450 |
*/ |
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
451 |
void report(DiagnosticPosition pos, JCDiagnostic details); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
452 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
453 |
* Obtain a warner for this check context |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
454 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
455 |
public Warner checkWarner(DiagnosticPosition pos, Type found, Type req); |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
456 |
|
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
457 |
public Infer.InferenceContext inferenceContext(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
458 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
459 |
public DeferredAttr.DeferredAttrContext deferredAttrContext(); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
460 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
461 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
462 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
463 |
* This class represent a check context that is nested within another check |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
464 |
* context - useful to check sub-expressions. The default behavior simply |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
465 |
* redirects all method calls to the enclosing check context leveraging |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
466 |
* the forwarding pattern. |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
467 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
468 |
static class NestedCheckContext implements CheckContext { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
469 |
CheckContext enclosingContext; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
470 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
471 |
NestedCheckContext(CheckContext enclosingContext) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
472 |
this.enclosingContext = enclosingContext; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
473 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
474 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
475 |
public boolean compatible(Type found, Type req, Warner warn) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
476 |
return enclosingContext.compatible(found, req, warn); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
477 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
478 |
|
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
479 |
public void report(DiagnosticPosition pos, JCDiagnostic details) { |
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
480 |
enclosingContext.report(pos, details); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
481 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
482 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
483 |
public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
484 |
return enclosingContext.checkWarner(pos, found, req); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
485 |
} |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
486 |
|
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
487 |
public Infer.InferenceContext inferenceContext() { |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
488 |
return enclosingContext.inferenceContext(); |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
489 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
490 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
491 |
public DeferredAttrContext deferredAttrContext() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
492 |
return enclosingContext.deferredAttrContext(); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
493 |
} |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
494 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
495 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
496 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
497 |
* Check context to be used when evaluating assignment/return statements |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
498 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
499 |
CheckContext basicHandler = new CheckContext() { |
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
500 |
public void report(DiagnosticPosition pos, JCDiagnostic details) { |
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
501 |
log.error(pos, "prob.found.req", details); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
502 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
503 |
public boolean compatible(Type found, Type req, Warner warn) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
504 |
return types.isAssignable(found, req, warn); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
505 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
506 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
507 |
public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
508 |
return convertWarner(pos, found, req); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
509 |
} |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
510 |
|
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
511 |
public InferenceContext inferenceContext() { |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
512 |
return infer.emptyContext; |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
513 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
514 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
515 |
public DeferredAttrContext deferredAttrContext() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
516 |
return deferredAttr.emptyDeferredAttrContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
517 |
} |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
518 |
}; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
519 |
|
10 | 520 |
/** Check that a given type is assignable to a given proto-type. |
521 |
* If it is, return the type, otherwise return errType. |
|
522 |
* @param pos Position to be used for error reporting. |
|
523 |
* @param found The type that was found. |
|
524 |
* @param req The type that was required. |
|
525 |
*/ |
|
526 |
Type checkType(DiagnosticPosition pos, Type found, Type req) { |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
527 |
return checkType(pos, found, req, basicHandler); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6147
diff
changeset
|
528 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6147
diff
changeset
|
529 |
|
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
530 |
Type checkType(final DiagnosticPosition pos, final Type found, final Type req, final CheckContext checkContext) { |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
531 |
final Infer.InferenceContext inferenceContext = checkContext.inferenceContext(); |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
532 |
if (inferenceContext.free(req)) { |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
533 |
inferenceContext.addFreeTypeListener(List.of(req), new FreeTypeListener() { |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
534 |
@Override |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
535 |
public void typesInferred(InferenceContext inferenceContext) { |
15705 | 536 |
checkType(pos, found, inferenceContext.asInstType(req), checkContext); |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
537 |
} |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
538 |
}); |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
539 |
} |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
540 |
if (req.hasTag(ERROR)) |
10 | 541 |
return req; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
542 |
if (req.hasTag(NONE)) |
10 | 543 |
return found; |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
544 |
if (checkContext.compatible(found, req, checkContext.checkWarner(pos, found, req))) { |
10 | 545 |
return found; |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
546 |
} else { |
18395
d56a5fbf0b32
8016267: javac, TypeTag refactoring has provoked performance issues
vromero
parents:
18393
diff
changeset
|
547 |
if (found.isNumeric() && req.isNumeric()) { |
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
548 |
checkContext.report(pos, diags.fragment("possible.loss.of.precision", found, req)); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
549 |
return types.createErrorType(found); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
550 |
} |
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
551 |
checkContext.report(pos, diags.fragment("inconvertible.types", found, req)); |
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
552 |
return types.createErrorType(found); |
10 | 553 |
} |
554 |
} |
|
555 |
||
556 |
/** Check that a given type can be cast to a given target type. |
|
557 |
* Return the result of the cast. |
|
558 |
* @param pos Position to be used for error reporting. |
|
559 |
* @param found The type that is being cast. |
|
560 |
* @param req The target type of the cast. |
|
561 |
*/ |
|
562 |
Type checkCastable(DiagnosticPosition pos, Type found, Type req) { |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
563 |
return checkCastable(pos, found, req, basicHandler); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
564 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
565 |
Type checkCastable(DiagnosticPosition pos, Type found, Type req, CheckContext checkContext) { |
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
566 |
if (types.isCastable(found, req, castWarner(pos, found, req))) { |
10 | 567 |
return req; |
568 |
} else { |
|
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
569 |
checkContext.report(pos, diags.fragment("inconvertible.types", found, req)); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
570 |
return types.createErrorType(found); |
10 | 571 |
} |
572 |
} |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
573 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
574 |
/** Check for redundant casts (i.e. where source type is a subtype of target type) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
575 |
* The problem should only be reported for non-292 cast |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
576 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
577 |
public void checkRedundantCast(Env<AttrContext> env, JCTypeCast tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
578 |
if (!tree.type.isErroneous() && |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
579 |
(env.info.lint == null || env.info.lint.isEnabled(Lint.LintCategory.CAST)) |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
580 |
&& types.isSameType(tree.expr.type, tree.clazz.type) |
15385 | 581 |
&& !(ignoreAnnotatedCasts && TreeInfo.containsTypeAnnotation(tree.clazz)) |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
582 |
&& !is292targetTypeCast(tree)) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
583 |
log.warning(Lint.LintCategory.CAST, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
584 |
tree.pos(), "redundant.cast", tree.expr.type); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
585 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
586 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
587 |
//where |
15385 | 588 |
private boolean is292targetTypeCast(JCTypeCast tree) { |
589 |
boolean is292targetTypeCast = false; |
|
590 |
JCExpression expr = TreeInfo.skipParens(tree.expr); |
|
591 |
if (expr.hasTag(APPLY)) { |
|
592 |
JCMethodInvocation apply = (JCMethodInvocation)expr; |
|
593 |
Symbol sym = TreeInfo.symbol(apply.meth); |
|
594 |
is292targetTypeCast = sym != null && |
|
595 |
sym.kind == MTH && |
|
596 |
(sym.flags() & HYPOTHETICAL) != 0; |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
597 |
} |
15385 | 598 |
return is292targetTypeCast; |
599 |
} |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
600 |
|
15385 | 601 |
private static final boolean ignoreAnnotatedCasts = true; |
10 | 602 |
|
603 |
/** Check that a type is within some bounds. |
|
604 |
* |
|
14259 | 605 |
* Used in TypeApply to verify that, e.g., X in {@code V<X>} is a valid |
10 | 606 |
* type argument. |
607 |
* @param a The type that should be bounded by bs. |
|
14259 | 608 |
* @param bound The bound. |
10 | 609 |
*/ |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
610 |
private boolean checkExtends(Type a, Type bound) { |
1527 | 611 |
if (a.isUnbound()) { |
8037 | 612 |
return true; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
613 |
} else if (!a.hasTag(WILDCARD)) { |
1527 | 614 |
a = types.upperBound(a); |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
615 |
return types.isSubtype(a, bound); |
1527 | 616 |
} else if (a.isExtendsBound()) { |
14547 | 617 |
return types.isCastable(bound, types.upperBound(a), types.noWarnings); |
1527 | 618 |
} else if (a.isSuperBound()) { |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
619 |
return !types.notSoftSubtype(types.lowerBound(a), bound); |
1527 | 620 |
} |
8037 | 621 |
return true; |
1527 | 622 |
} |
10 | 623 |
|
624 |
/** Check that type is different from 'void'. |
|
625 |
* @param pos Position to be used for error reporting. |
|
626 |
* @param t The type to be checked. |
|
627 |
*/ |
|
628 |
Type checkNonVoid(DiagnosticPosition pos, Type t) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
629 |
if (t.hasTag(VOID)) { |
10 | 630 |
log.error(pos, "void.not.allowed.here"); |
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
631 |
return types.createErrorType(t); |
10 | 632 |
} else { |
633 |
return t; |
|
634 |
} |
|
635 |
} |
|
636 |
||
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
637 |
Type checkClassOrArrayType(DiagnosticPosition pos, Type t) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
638 |
if (!t.hasTag(CLASS) && !t.hasTag(ARRAY) && !t.hasTag(ERROR)) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
639 |
return typeTagError(pos, |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
640 |
diags.fragment("type.req.class.array"), |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
641 |
asTypeParam(t)); |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
642 |
} else { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
643 |
return t; |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
644 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
645 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
646 |
|
10 | 647 |
/** Check that type is a class or interface type. |
648 |
* @param pos Position to be used for error reporting. |
|
649 |
* @param t The type to be checked. |
|
650 |
*/ |
|
651 |
Type checkClassType(DiagnosticPosition pos, Type t) { |
|
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
652 |
if (!t.hasTag(CLASS) && !t.hasTag(ERROR)) { |
10 | 653 |
return typeTagError(pos, |
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
654 |
diags.fragment("type.req.class"), |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
655 |
asTypeParam(t)); |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
656 |
} else { |
10 | 657 |
return t; |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
658 |
} |
10 | 659 |
} |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
660 |
//where |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
661 |
private Object asTypeParam(Type t) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
662 |
return (t.hasTag(TYPEVAR)) |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
663 |
? diags.fragment("type.parameter", t) |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
664 |
: t; |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
665 |
} |
10 | 666 |
|
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
667 |
/** Check that type is a valid qualifier for a constructor reference expression |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
668 |
*/ |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
669 |
Type checkConstructorRefType(DiagnosticPosition pos, Type t) { |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
670 |
t = checkClassOrArrayType(pos, t); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
671 |
if (t.hasTag(CLASS)) { |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
672 |
if ((t.tsym.flags() & (ABSTRACT | INTERFACE)) != 0) { |
16340
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
673 |
log.error(pos, "abstract.cant.be.instantiated", t.tsym); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
674 |
t = types.createErrorType(t); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
675 |
} else if ((t.tsym.flags() & ENUM) != 0) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
676 |
log.error(pos, "enum.cant.be.instantiated"); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
677 |
t = types.createErrorType(t); |
16340
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
678 |
} else { |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
679 |
t = checkClassType(pos, t, true); |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
680 |
} |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
681 |
} else if (t.hasTag(ARRAY)) { |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
682 |
if (!types.isReifiable(((ArrayType)t).elemtype)) { |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
683 |
log.error(pos, "generic.array.creation"); |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
684 |
t = types.createErrorType(t); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
685 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
686 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
687 |
return t; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
688 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
689 |
|
10 | 690 |
/** Check that type is a class or interface type. |
691 |
* @param pos Position to be used for error reporting. |
|
692 |
* @param t The type to be checked. |
|
693 |
* @param noBounds True if type bounds are illegal here. |
|
694 |
*/ |
|
695 |
Type checkClassType(DiagnosticPosition pos, Type t, boolean noBounds) { |
|
696 |
t = checkClassType(pos, t); |
|
697 |
if (noBounds && t.isParameterized()) { |
|
698 |
List<Type> args = t.getTypeArguments(); |
|
699 |
while (args.nonEmpty()) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
700 |
if (args.head.hasTag(WILDCARD)) |
10 | 701 |
return typeTagError(pos, |
6032 | 702 |
diags.fragment("type.req.exact"), |
10 | 703 |
args.head); |
704 |
args = args.tail; |
|
705 |
} |
|
706 |
} |
|
707 |
return t; |
|
708 |
} |
|
709 |
||
710 |
/** Check that type is a reifiable class, interface or array type. |
|
711 |
* @param pos Position to be used for error reporting. |
|
712 |
* @param t The type to be checked. |
|
713 |
*/ |
|
714 |
Type checkReifiableReferenceType(DiagnosticPosition pos, Type t) { |
|
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
715 |
t = checkClassOrArrayType(pos, t); |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
716 |
if (!t.isErroneous() && !types.isReifiable(t)) { |
10 | 717 |
log.error(pos, "illegal.generic.type.for.instof"); |
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
718 |
return types.createErrorType(t); |
10 | 719 |
} else { |
720 |
return t; |
|
721 |
} |
|
722 |
} |
|
723 |
||
724 |
/** Check that type is a reference type, i.e. a class, interface or array type |
|
725 |
* or a type variable. |
|
726 |
* @param pos Position to be used for error reporting. |
|
727 |
* @param t The type to be checked. |
|
728 |
*/ |
|
729 |
Type checkRefType(DiagnosticPosition pos, Type t) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
730 |
if (t.isReference()) |
10 | 731 |
return t; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
732 |
else |
10 | 733 |
return typeTagError(pos, |
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
734 |
diags.fragment("type.req.ref"), |
10 | 735 |
t); |
736 |
} |
|
737 |
||
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
738 |
/** Check that each type is a reference type, i.e. a class, interface or array type |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
739 |
* or a type variable. |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
740 |
* @param trees Original trees, used for error reporting. |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
741 |
* @param types The types to be checked. |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
742 |
*/ |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
743 |
List<Type> checkRefTypes(List<JCExpression> trees, List<Type> types) { |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
744 |
List<JCExpression> tl = trees; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
745 |
for (List<Type> l = types; l.nonEmpty(); l = l.tail) { |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
746 |
l.head = checkRefType(tl.head.pos(), l.head); |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
747 |
tl = tl.tail; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
748 |
} |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
749 |
return types; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
750 |
} |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
751 |
|
10 | 752 |
/** Check that type is a null or reference type. |
753 |
* @param pos Position to be used for error reporting. |
|
754 |
* @param t The type to be checked. |
|
755 |
*/ |
|
756 |
Type checkNullOrRefType(DiagnosticPosition pos, Type t) { |
|
18395
d56a5fbf0b32
8016267: javac, TypeTag refactoring has provoked performance issues
vromero
parents:
18393
diff
changeset
|
757 |
if (t.isReference() || t.hasTag(BOT)) |
10 | 758 |
return t; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
759 |
else |
10 | 760 |
return typeTagError(pos, |
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
761 |
diags.fragment("type.req.ref"), |
10 | 762 |
t); |
763 |
} |
|
764 |
||
765 |
/** Check that flag set does not contain elements of two conflicting sets. s |
|
766 |
* Return true if it doesn't. |
|
767 |
* @param pos Position to be used for error reporting. |
|
768 |
* @param flags The set of flags to be checked. |
|
769 |
* @param set1 Conflicting flags set #1. |
|
770 |
* @param set2 Conflicting flags set #2. |
|
771 |
*/ |
|
772 |
boolean checkDisjoint(DiagnosticPosition pos, long flags, long set1, long set2) { |
|
773 |
if ((flags & set1) != 0 && (flags & set2) != 0) { |
|
774 |
log.error(pos, |
|
775 |
"illegal.combination.of.modifiers", |
|
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
938
diff
changeset
|
776 |
asFlagSet(TreeInfo.firstFlag(flags & set1)), |
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
938
diff
changeset
|
777 |
asFlagSet(TreeInfo.firstFlag(flags & set2))); |
10 | 778 |
return false; |
779 |
} else |
|
780 |
return true; |
|
781 |
} |
|
782 |
||
8635
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
783 |
/** Check that usage of diamond operator is correct (i.e. diamond should not |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
784 |
* be used with non-generic classes or in anonymous class creation expressions) |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
785 |
*/ |
8635
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
786 |
Type checkDiamond(JCNewClass tree, Type t) { |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
787 |
if (!TreeInfo.isDiamond(tree) || |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
788 |
t.isErroneous()) { |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
789 |
return checkClassType(tree.clazz.pos(), t, true); |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
790 |
} else if (tree.def != null) { |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
791 |
log.error(tree.clazz.pos(), |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
792 |
"cant.apply.diamond.1", |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
793 |
t, diags.fragment("diamond.and.anon.class", t)); |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
794 |
return types.createErrorType(t); |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8635
diff
changeset
|
795 |
} else if (t.tsym.type.getTypeArguments().isEmpty()) { |
8635
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
796 |
log.error(tree.clazz.pos(), |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
797 |
"cant.apply.diamond.1", |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
798 |
t, diags.fragment("diamond.non.generic", t)); |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
799 |
return types.createErrorType(t); |
9604
d7152128d22f
7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments
mcimadamore
parents:
9303
diff
changeset
|
800 |
} else if (tree.typeargs != null && |
d7152128d22f
7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments
mcimadamore
parents:
9303
diff
changeset
|
801 |
tree.typeargs.nonEmpty()) { |
d7152128d22f
7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments
mcimadamore
parents:
9303
diff
changeset
|
802 |
log.error(tree.clazz.pos(), |
d7152128d22f
7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments
mcimadamore
parents:
9303
diff
changeset
|
803 |
"cant.apply.diamond.1", |
d7152128d22f
7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments
mcimadamore
parents:
9303
diff
changeset
|
804 |
t, diags.fragment("diamond.and.explicit.params", t)); |
d7152128d22f
7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments
mcimadamore
parents:
9303
diff
changeset
|
805 |
return types.createErrorType(t); |
8635
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
806 |
} else { |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
807 |
return t; |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
808 |
} |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
809 |
} |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
810 |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
811 |
void checkVarargsMethodDecl(Env<AttrContext> env, JCMethodDecl tree) { |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
812 |
MethodSymbol m = tree.sym; |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
813 |
if (!allowSimplifiedVarargs) return; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
814 |
boolean hasTrustMeAnno = m.attribute(syms.trustMeType.tsym) != null; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
815 |
Type varargElemType = null; |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
816 |
if (m.isVarArgs()) { |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
817 |
varargElemType = types.elemtype(tree.params.last().type); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
818 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
819 |
if (hasTrustMeAnno && !isTrustMeAllowedOnMethod(m)) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
820 |
if (varargElemType != null) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
821 |
log.error(tree, |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
822 |
"varargs.invalid.trustme.anno", |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
823 |
syms.trustMeType.tsym, |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
824 |
diags.fragment("varargs.trustme.on.virtual.varargs", m)); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
825 |
} else { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
826 |
log.error(tree, |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
827 |
"varargs.invalid.trustme.anno", |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
828 |
syms.trustMeType.tsym, |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
829 |
diags.fragment("varargs.trustme.on.non.varargs.meth", m)); |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
830 |
} |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
831 |
} else if (hasTrustMeAnno && varargElemType != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
832 |
types.isReifiable(varargElemType)) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
833 |
warnUnsafeVararg(tree, |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
834 |
"varargs.redundant.trustme.anno", |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
835 |
syms.trustMeType.tsym, |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
836 |
diags.fragment("varargs.trustme.on.reifiable.varargs", varargElemType)); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
837 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
838 |
else if (!hasTrustMeAnno && varargElemType != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
839 |
!types.isReifiable(varargElemType)) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
840 |
warnUnchecked(tree.params.head.pos(), "unchecked.varargs.non.reifiable.type", varargElemType); |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
841 |
} |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
842 |
} |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
843 |
//where |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
844 |
private boolean isTrustMeAllowedOnMethod(Symbol s) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
845 |
return (s.flags() & VARARGS) != 0 && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
846 |
(s.isConstructor() || |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
847 |
(s.flags() & (STATIC | FINAL)) != 0); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
848 |
} |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
849 |
|
18381
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
850 |
Type checkMethod(final Type mtype, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
851 |
final Symbol sym, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
852 |
final Env<AttrContext> env, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
853 |
final List<JCExpression> argtrees, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
854 |
final List<Type> argtypes, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
855 |
final boolean useVarargs, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
856 |
InferenceContext inferenceContext) { |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
857 |
// System.out.println("call : " + env.tree); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
858 |
// System.out.println("method : " + owntype); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
859 |
// System.out.println("actuals: " + argtypes); |
18381
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
860 |
if (inferenceContext.free(mtype)) { |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
861 |
inferenceContext.addFreeTypeListener(List.of(mtype), new FreeTypeListener() { |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
862 |
public void typesInferred(InferenceContext inferenceContext) { |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
863 |
checkMethod(inferenceContext.asInstType(mtype), sym, env, argtrees, argtypes, useVarargs, inferenceContext); |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
864 |
} |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
865 |
}); |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
866 |
return mtype; |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
867 |
} |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
868 |
Type owntype = mtype; |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
869 |
List<Type> formals = owntype.getParameterTypes(); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
870 |
Type last = useVarargs ? formals.last() : null; |
15385 | 871 |
if (sym.name == names.init && |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
872 |
sym.owner == syms.enumSym) |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
873 |
formals = formals.tail.tail; |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
874 |
List<JCExpression> args = argtrees; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
875 |
if (args != null) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
876 |
//this is null when type-checking a method reference |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
877 |
while (formals.head != last) { |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
878 |
JCTree arg = args.head; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
879 |
Warner warn = convertWarner(arg.pos(), arg.type, formals.head); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
880 |
assertConvertible(arg, arg.type, formals.head, warn); |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
881 |
args = args.tail; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
882 |
formals = formals.tail; |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
883 |
} |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
884 |
if (useVarargs) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
885 |
Type varArg = types.elemtype(last); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
886 |
while (args.tail != null) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
887 |
JCTree arg = args.head; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
888 |
Warner warn = convertWarner(arg.pos(), arg.type, varArg); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
889 |
assertConvertible(arg, arg.type, varArg, warn); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
890 |
args = args.tail; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
891 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
892 |
} else if ((sym.flags() & VARARGS) != 0 && allowVarargs) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
893 |
// non-varargs call to varargs method |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
894 |
Type varParam = owntype.getParameterTypes().last(); |
18381
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
895 |
Type lastArg = argtypes.last(); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
896 |
if (types.isSubtypeUnchecked(lastArg, types.elemtype(varParam)) && |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
897 |
!types.isSameType(types.erasure(varParam), types.erasure(lastArg))) |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
898 |
log.warning(argtrees.last().pos(), "inexact.non-varargs.call", |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
899 |
types.elemtype(varParam), varParam); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
900 |
} |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
901 |
} |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
902 |
if (useVarargs) { |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
903 |
Type argtype = owntype.getParameterTypes().last(); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
904 |
if (!types.isReifiable(argtype) && |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
905 |
(!allowSimplifiedVarargs || |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
906 |
sym.attribute(syms.trustMeType.tsym) == null || |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
907 |
!isTrustMeAllowedOnMethod(sym))) { |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
908 |
warnUnchecked(env.tree.pos(), |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
909 |
"unchecked.generic.array.creation", |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
910 |
argtype); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
911 |
} |
18389
a425d0819f36
8016569: javac, add new flag for polymorphic method signatures
vromero
parents:
18381
diff
changeset
|
912 |
if ((sym.baseSymbol().flags() & SIGNATURE_POLYMORPHIC) == 0) { |
18381
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
913 |
TreeInfo.setVarargsElement(env.tree, types.elemtype(argtype)); |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
914 |
} |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
915 |
} |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15361
diff
changeset
|
916 |
PolyKind pkind = (sym.type.hasTag(FORALL) && |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15361
diff
changeset
|
917 |
sym.type.getReturnType().containsAny(((ForAll)sym.type).tvars)) ? |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15361
diff
changeset
|
918 |
PolyKind.POLY : PolyKind.STANDALONE; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15361
diff
changeset
|
919 |
TreeInfo.setPolyKind(env.tree, pkind); |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
920 |
return owntype; |
5489
e7af65bf7577
6730476: invalid "unchecked generic array" warning
mcimadamore
parents:
5321
diff
changeset
|
921 |
} |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
922 |
//where |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
923 |
private void assertConvertible(JCTree tree, Type actual, Type formal, Warner warn) { |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
924 |
if (types.isConvertible(actual, formal, warn)) |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
925 |
return; |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
926 |
|
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
927 |
if (formal.isCompound() |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
928 |
&& types.isSubtype(actual, types.supertype(formal)) |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
929 |
&& types.isSubtypeUnchecked(actual, types.interfaces(formal), warn)) |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
930 |
return; |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
931 |
} |
5489
e7af65bf7577
6730476: invalid "unchecked generic array" warning
mcimadamore
parents:
5321
diff
changeset
|
932 |
|
8037 | 933 |
/** |
934 |
* Check that type 't' is a valid instantiation of a generic class |
|
935 |
* (see JLS 4.5) |
|
936 |
* |
|
937 |
* @param t class type to be checked |
|
938 |
* @return true if 't' is well-formed |
|
939 |
*/ |
|
940 |
public boolean checkValidGenericType(Type t) { |
|
941 |
return firstIncompatibleTypeArg(t) == null; |
|
942 |
} |
|
943 |
//WHERE |
|
944 |
private Type firstIncompatibleTypeArg(Type type) { |
|
945 |
List<Type> formals = type.tsym.type.allparams(); |
|
946 |
List<Type> actuals = type.allparams(); |
|
947 |
List<Type> args = type.getTypeArguments(); |
|
948 |
List<Type> forms = type.tsym.type.getTypeArguments(); |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
949 |
ListBuffer<Type> bounds_buf = new ListBuffer<Type>(); |
8037 | 950 |
|
951 |
// For matching pairs of actual argument types `a' and |
|
952 |
// formal type parameters with declared bound `b' ... |
|
953 |
while (args.nonEmpty() && forms.nonEmpty()) { |
|
954 |
// exact type arguments needs to know their |
|
955 |
// bounds (for upper and lower bound |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
956 |
// calculations). So we create new bounds where |
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
957 |
// type-parameters are replaced with actuals argument types. |
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
958 |
bounds_buf.append(types.subst(forms.head.getUpperBound(), formals, actuals)); |
8037 | 959 |
args = args.tail; |
960 |
forms = forms.tail; |
|
961 |
} |
|
962 |
||
963 |
args = type.getTypeArguments(); |
|
964 |
List<Type> tvars_cap = types.substBounds(formals, |
|
965 |
formals, |
|
966 |
types.capture(type).allparams()); |
|
967 |
while (args.nonEmpty() && tvars_cap.nonEmpty()) { |
|
968 |
// Let the actual arguments know their bound |
|
969 |
args.head.withTypeVar((TypeVar)tvars_cap.head); |
|
970 |
args = args.tail; |
|
971 |
tvars_cap = tvars_cap.tail; |
|
972 |
} |
|
973 |
||
974 |
args = type.getTypeArguments(); |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
975 |
List<Type> bounds = bounds_buf.toList(); |
8037 | 976 |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
977 |
while (args.nonEmpty() && bounds.nonEmpty()) { |
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
978 |
Type actual = args.head; |
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
979 |
if (!isTypeArgErroneous(actual) && |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
980 |
!bounds.head.isErroneous() && |
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
981 |
!checkExtends(actual, bounds.head)) { |
8037 | 982 |
return args.head; |
983 |
} |
|
984 |
args = args.tail; |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
985 |
bounds = bounds.tail; |
8037 | 986 |
} |
987 |
||
988 |
args = type.getTypeArguments(); |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
989 |
bounds = bounds_buf.toList(); |
8037 | 990 |
|
991 |
for (Type arg : types.capture(type).getTypeArguments()) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
992 |
if (arg.hasTag(TYPEVAR) && |
8044
7fd529d4472c
6943278: spurious error message for inference and type-variable with erroneous bound
mcimadamore
parents:
8037
diff
changeset
|
993 |
arg.getUpperBound().isErroneous() && |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
994 |
!bounds.head.isErroneous() && |
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
995 |
!isTypeArgErroneous(args.head)) { |
8037 | 996 |
return args.head; |
997 |
} |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
998 |
bounds = bounds.tail; |
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
999 |
args = args.tail; |
8037 | 1000 |
} |
1001 |
||
1002 |
return null; |
|
1003 |
} |
|
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1004 |
//where |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1005 |
boolean isTypeArgErroneous(Type t) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1006 |
return isTypeArgErroneous.visit(t); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1007 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1008 |
|
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1009 |
Types.UnaryVisitor<Boolean> isTypeArgErroneous = new Types.UnaryVisitor<Boolean>() { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1010 |
public Boolean visitType(Type t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1011 |
return t.isErroneous(); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1012 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1013 |
@Override |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1014 |
public Boolean visitTypeVar(TypeVar t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1015 |
return visit(t.getUpperBound()); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1016 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1017 |
@Override |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1018 |
public Boolean visitCapturedType(CapturedType t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1019 |
return visit(t.getUpperBound()) || |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1020 |
visit(t.getLowerBound()); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1021 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1022 |
@Override |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1023 |
public Boolean visitWildcardType(WildcardType t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1024 |
return visit(t.type); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1025 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1026 |
}; |
8037 | 1027 |
|
10 | 1028 |
/** Check that given modifiers are legal for given symbol and |
15710
5792a085da41
7166455: javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
vromero
parents:
15705
diff
changeset
|
1029 |
* return modifiers together with any implicit modifiers for that symbol. |
10 | 1030 |
* Warning: we can't use flags() here since this method |
1031 |
* is called during class enter, when flags() would cause a premature |
|
1032 |
* completion. |
|
1033 |
* @param pos Position to be used for error reporting. |
|
1034 |
* @param flags The set of modifiers given in a definition. |
|
1035 |
* @param sym The defined symbol. |
|
1036 |
*/ |
|
1037 |
long checkFlags(DiagnosticPosition pos, long flags, Symbol sym, JCTree tree) { |
|
1038 |
long mask; |
|
1039 |
long implicit = 0; |
|
1040 |
switch (sym.kind) { |
|
1041 |
case VAR: |
|
1042 |
if (sym.owner.kind != TYP) |
|
1043 |
mask = LocalVarFlags; |
|
1044 |
else if ((sym.owner.flags_field & INTERFACE) != 0) |
|
1045 |
mask = implicit = InterfaceVarFlags; |
|
1046 |
else |
|
1047 |
mask = VarFlags; |
|
1048 |
break; |
|
1049 |
case MTH: |
|
1050 |
if (sym.name == names.init) { |
|
1051 |
if ((sym.owner.flags_field & ENUM) != 0) { |
|
1052 |
// enum constructors cannot be declared public or |
|
1053 |
// protected and must be implicitly or explicitly |
|
1054 |
// private |
|
1055 |
implicit = PRIVATE; |
|
1056 |
mask = PRIVATE; |
|
1057 |
} else |
|
1058 |
mask = ConstructorFlags; |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1059 |
} else if ((sym.owner.flags_field & INTERFACE) != 0) { |
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1060 |
if ((flags & (DEFAULT | STATIC)) != 0) { |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1061 |
mask = InterfaceMethodMask; |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1062 |
implicit = PUBLIC; |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1063 |
if ((flags & DEFAULT) != 0) { |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1064 |
implicit |= ABSTRACT; |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1065 |
} |
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1066 |
} else { |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1067 |
mask = implicit = InterfaceMethodFlags; |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1068 |
} |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1069 |
} |
10 | 1070 |
else { |
1071 |
mask = MethodFlags; |
|
1072 |
} |
|
1073 |
// Imply STRICTFP if owner has STRICTFP set. |
|
17281
7c38e715fd75
8012723: strictfp interface misses strictfp modifer on default method
vromero
parents:
16546
diff
changeset
|
1074 |
if (((flags|implicit) & Flags.ABSTRACT) == 0 || |
7c38e715fd75
8012723: strictfp interface misses strictfp modifer on default method
vromero
parents:
16546
diff
changeset
|
1075 |
((flags) & Flags.DEFAULT) != 0) |
15710
5792a085da41
7166455: javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
vromero
parents:
15705
diff
changeset
|
1076 |
implicit |= sym.owner.flags_field & STRICTFP; |
10 | 1077 |
break; |
1078 |
case TYP: |
|
1079 |
if (sym.isLocal()) { |
|
1080 |
mask = LocalClassFlags; |
|
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
1081 |
if (sym.name.isEmpty()) { // Anonymous class |
10 | 1082 |
// Anonymous classes in static methods are themselves static; |
1083 |
// that's why we admit STATIC here. |
|
1084 |
mask |= STATIC; |
|
1085 |
// JLS: Anonymous classes are final. |
|
1086 |
implicit |= FINAL; |
|
1087 |
} |
|
1088 |
if ((sym.owner.flags_field & STATIC) == 0 && |
|
1089 |
(flags & ENUM) != 0) |
|
1090 |
log.error(pos, "enums.must.be.static"); |
|
1091 |
} else if (sym.owner.kind == TYP) { |
|
1092 |
mask = MemberClassFlags; |
|
1093 |
if (sym.owner.owner.kind == PCK || |
|
1094 |
(sym.owner.flags_field & STATIC) != 0) |
|
1095 |
mask |= STATIC; |
|
1096 |
else if ((flags & ENUM) != 0) |
|
1097 |
log.error(pos, "enums.must.be.static"); |
|
1098 |
// Nested interfaces and enums are always STATIC (Spec ???) |
|
1099 |
if ((flags & (INTERFACE | ENUM)) != 0 ) implicit = STATIC; |
|
1100 |
} else { |
|
1101 |
mask = ClassFlags; |
|
1102 |
} |
|
1103 |
// Interfaces are always ABSTRACT |
|
1104 |
if ((flags & INTERFACE) != 0) implicit |= ABSTRACT; |
|
1105 |
||
1106 |
if ((flags & ENUM) != 0) { |
|
1107 |
// enums can't be declared abstract or final |
|
1108 |
mask &= ~(ABSTRACT | FINAL); |
|
1109 |
implicit |= implicitEnumFinalFlag(tree); |
|
1110 |
} |
|
1111 |
// Imply STRICTFP if owner has STRICTFP set. |
|
1112 |
implicit |= sym.owner.flags_field & STRICTFP; |
|
1113 |
break; |
|
1114 |
default: |
|
1115 |
throw new AssertionError(); |
|
1116 |
} |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1117 |
long illegal = flags & ExtendedStandardFlags & ~mask; |
10 | 1118 |
if (illegal != 0) { |
1119 |
if ((illegal & INTERFACE) != 0) { |
|
1120 |
log.error(pos, "intf.not.allowed.here"); |
|
1121 |
mask |= INTERFACE; |
|
1122 |
} |
|
1123 |
else { |
|
1124 |
log.error(pos, |
|
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
938
diff
changeset
|
1125 |
"mod.not.allowed.here", asFlagSet(illegal)); |
10 | 1126 |
} |
1127 |
} |
|
1128 |
else if ((sym.kind == TYP || |
|
1129 |
// ISSUE: Disallowing abstract&private is no longer appropriate |
|
1130 |
// in the presence of inner classes. Should it be deleted here? |
|
1131 |
checkDisjoint(pos, flags, |
|
1132 |
ABSTRACT, |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1133 |
PRIVATE | STATIC | DEFAULT)) |
10 | 1134 |
&& |
1135 |
checkDisjoint(pos, flags, |
|
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1136 |
STATIC, |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1137 |
DEFAULT) |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1138 |
&& |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1139 |
checkDisjoint(pos, flags, |
10 | 1140 |
ABSTRACT | INTERFACE, |
1141 |
FINAL | NATIVE | SYNCHRONIZED) |
|
1142 |
&& |
|
1143 |
checkDisjoint(pos, flags, |
|
1144 |
PUBLIC, |
|
1145 |
PRIVATE | PROTECTED) |
|
1146 |
&& |
|
1147 |
checkDisjoint(pos, flags, |
|
1148 |
PRIVATE, |
|
1149 |
PUBLIC | PROTECTED) |
|
1150 |
&& |
|
1151 |
checkDisjoint(pos, flags, |
|
1152 |
FINAL, |
|
1153 |
VOLATILE) |
|
1154 |
&& |
|
1155 |
(sym.kind == TYP || |
|
1156 |
checkDisjoint(pos, flags, |
|
1157 |
ABSTRACT | NATIVE, |
|
1158 |
STRICTFP))) { |
|
1159 |
// skip |
|
1160 |
} |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1161 |
return flags & (mask | ~ExtendedStandardFlags) | implicit; |
10 | 1162 |
} |
1163 |
||
1164 |
||
1165 |
/** Determine if this enum should be implicitly final. |
|
1166 |
* |
|
1167 |
* If the enum has no specialized enum contants, it is final. |
|
1168 |
* |
|
1169 |
* If the enum does have specialized enum contants, it is |
|
1170 |
* <i>not</i> final. |
|
1171 |
*/ |
|
1172 |
private long implicitEnumFinalFlag(JCTree tree) { |
|
10950 | 1173 |
if (!tree.hasTag(CLASSDEF)) return 0; |
10 | 1174 |
class SpecialTreeVisitor extends JCTree.Visitor { |
1175 |
boolean specialized; |
|
1176 |
SpecialTreeVisitor() { |
|
1177 |
this.specialized = false; |
|
1178 |
}; |
|
1179 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1180 |
@Override |
10 | 1181 |
public void visitTree(JCTree tree) { /* no-op */ } |
1182 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1183 |
@Override |
10 | 1184 |
public void visitVarDef(JCVariableDecl tree) { |
1185 |
if ((tree.mods.flags & ENUM) != 0) { |
|
1186 |
if (tree.init instanceof JCNewClass && |
|
1187 |
((JCNewClass) tree.init).def != null) { |
|
1188 |
specialized = true; |
|
1189 |
} |
|
1190 |
} |
|
1191 |
} |
|
1192 |
} |
|
1193 |
||
1194 |
SpecialTreeVisitor sts = new SpecialTreeVisitor(); |
|
1195 |
JCClassDecl cdef = (JCClassDecl) tree; |
|
1196 |
for (JCTree defs: cdef.defs) { |
|
1197 |
defs.accept(sts); |
|
1198 |
if (sts.specialized) return 0; |
|
1199 |
} |
|
1200 |
return FINAL; |
|
1201 |
} |
|
1202 |
||
1203 |
/* ************************************************************************* |
|
1204 |
* Type Validation |
|
1205 |
**************************************************************************/ |
|
1206 |
||
1207 |
/** Validate a type expression. That is, |
|
1208 |
* check that all type arguments of a parametric type are within |
|
17578 | 1209 |
* their bounds. This must be done in a second phase after type attribution |
10 | 1210 |
* since a class might have a subclass as type parameter bound. E.g: |
1211 |
* |
|
14259 | 1212 |
* <pre>{@code |
10 | 1213 |
* class B<A extends C> { ... } |
1214 |
* class C extends B<C> { ... } |
|
14259 | 1215 |
* }</pre> |
10 | 1216 |
* |
1217 |
* and we can't make sure that the bound is already attributed because |
|
1218 |
* of possible cycles. |
|
6351 | 1219 |
* |
1220 |
* Visitor method: Validate a type expression, if it is not null, catching |
|
10 | 1221 |
* and reporting any completion failures. |
1222 |
*/ |
|
1358 | 1223 |
void validate(JCTree tree, Env<AttrContext> env) { |
6351 | 1224 |
validate(tree, env, true); |
10 | 1225 |
} |
6351 | 1226 |
void validate(JCTree tree, Env<AttrContext> env, boolean checkRaw) { |
1227 |
new Validator(env).validateTree(tree, checkRaw, true); |
|
1358 | 1228 |
} |
10 | 1229 |
|
1230 |
/** Visitor method: Validate a list of type expressions. |
|
1231 |
*/ |
|
1358 | 1232 |
void validate(List<? extends JCTree> trees, Env<AttrContext> env) { |
10 | 1233 |
for (List<? extends JCTree> l = trees; l.nonEmpty(); l = l.tail) |
1358 | 1234 |
validate(l.head, env); |
10 | 1235 |
} |
1236 |
||
1237 |
/** A visitor class for type validation. |
|
1238 |
*/ |
|
1239 |
class Validator extends JCTree.Visitor { |
|
1240 |
||
6351 | 1241 |
boolean isOuter; |
1242 |
Env<AttrContext> env; |
|
1243 |
||
1244 |
Validator(Env<AttrContext> env) { |
|
1245 |
this.env = env; |
|
1246 |
} |
|
1247 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1248 |
@Override |
10 | 1249 |
public void visitTypeArray(JCArrayTypeTree tree) { |
6351 | 1250 |
tree.elemtype.accept(this); |
10 | 1251 |
} |
1252 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1253 |
@Override |
10 | 1254 |
public void visitTypeApply(JCTypeApply tree) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1255 |
if (tree.type.hasTag(CLASS)) { |
10 | 1256 |
List<JCExpression> args = tree.arguments; |
1531
37df4e42719a
6557954: Inner class type parameters doesn't get substituted when checking type well-formedness
mcimadamore
parents:
1527
diff
changeset
|
1257 |
List<Type> forms = tree.type.tsym.type.getTypeArguments(); |
8037 | 1258 |
|
1259 |
Type incompatibleArg = firstIncompatibleTypeArg(tree.type); |
|
1260 |
if (incompatibleArg != null) { |
|
1261 |
for (JCTree arg : tree.arguments) { |
|
1262 |
if (arg.type == incompatibleArg) { |
|
8045 | 1263 |
log.error(arg, "not.within.bounds", incompatibleArg, forms.head); |
8037 | 1264 |
} |
8045 | 1265 |
forms = forms.tail; |
1266 |
} |
|
1267 |
} |
|
1268 |
||
1269 |
forms = tree.type.tsym.type.getTypeArguments(); |
|
10 | 1270 |
|
6351 | 1271 |
boolean is_java_lang_Class = tree.type.tsym.flatName() == names.java_lang_Class; |
1272 |
||
10 | 1273 |
// For matching pairs of actual argument types `a' and |
1274 |
// formal type parameters with declared bound `b' ... |
|
1275 |
while (args.nonEmpty() && forms.nonEmpty()) { |
|
6351 | 1276 |
validateTree(args.head, |
1277 |
!(isOuter && is_java_lang_Class), |
|
1278 |
false); |
|
10 | 1279 |
args = args.tail; |
1280 |
forms = forms.tail; |
|
1281 |
} |
|
1282 |
||
1283 |
// Check that this type is either fully parameterized, or |
|
1284 |
// not parameterized at all. |
|
1285 |
if (tree.type.getEnclosingType().isRaw()) |
|
1286 |
log.error(tree.pos(), "improperly.formed.type.inner.raw.param"); |
|
10950 | 1287 |
if (tree.clazz.hasTag(SELECT)) |
10 | 1288 |
visitSelectInternal((JCFieldAccess)tree.clazz); |
1289 |
} |
|
1290 |
} |
|
1291 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1292 |
@Override |
10 | 1293 |
public void visitTypeParameter(JCTypeParameter tree) { |
6351 | 1294 |
validateTrees(tree.bounds, true, isOuter); |
10 | 1295 |
checkClassBounds(tree.pos(), tree.type); |
1296 |
} |
|
1297 |
||
1298 |
@Override |
|
1299 |
public void visitWildcard(JCWildcard tree) { |
|
1300 |
if (tree.inner != null) |
|
6351 | 1301 |
validateTree(tree.inner, true, isOuter); |
10 | 1302 |
} |
1303 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1304 |
@Override |
10 | 1305 |
public void visitSelect(JCFieldAccess tree) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1306 |
if (tree.type.hasTag(CLASS)) { |
10 | 1307 |
visitSelectInternal(tree); |
1308 |
||
1309 |
// Check that this type is either fully parameterized, or |
|
1310 |
// not parameterized at all. |
|
1311 |
if (tree.selected.type.isParameterized() && tree.type.tsym.type.getTypeArguments().nonEmpty()) |
|
1312 |
log.error(tree.pos(), "improperly.formed.type.param.missing"); |
|
1313 |
} |
|
1314 |
} |
|
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
1315 |
|
10 | 1316 |
public void visitSelectInternal(JCFieldAccess tree) { |
1358 | 1317 |
if (tree.type.tsym.isStatic() && |
10 | 1318 |
tree.selected.type.isParameterized()) { |
1319 |
// The enclosing type is not a class, so we are |
|
1320 |
// looking at a static member type. However, the |
|
1321 |
// qualifying expression is parameterized. |
|
1322 |
log.error(tree.pos(), "cant.select.static.class.from.param.type"); |
|
1323 |
} else { |
|
1324 |
// otherwise validate the rest of the expression |
|
1358 | 1325 |
tree.selected.accept(this); |
10 | 1326 |
} |
1327 |
} |
|
1328 |
||
15385 | 1329 |
@Override |
1330 |
public void visitAnnotatedType(JCAnnotatedType tree) { |
|
1331 |
tree.underlyingType.accept(this); |
|
1332 |
} |
|
1333 |
||
10 | 1334 |
/** Default visitor method: do nothing. |
1335 |
*/ |
|
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1336 |
@Override |
10 | 1337 |
public void visitTree(JCTree tree) { |
1338 |
} |
|
1358 | 1339 |
|
6351 | 1340 |
public void validateTree(JCTree tree, boolean checkRaw, boolean isOuter) { |
1341 |
try { |
|
1342 |
if (tree != null) { |
|
1343 |
this.isOuter = isOuter; |
|
1344 |
tree.accept(this); |
|
1345 |
if (checkRaw) |
|
1346 |
checkRaw(tree, env); |
|
1347 |
} |
|
1348 |
} catch (CompletionFailure ex) { |
|
1349 |
completionError(tree.pos(), ex); |
|
1350 |
} |
|
1351 |
} |
|
1352 |
||
1353 |
public void validateTrees(List<? extends JCTree> trees, boolean checkRaw, boolean isOuter) { |
|
1354 |
for (List<? extends JCTree> l = trees; l.nonEmpty(); l = l.tail) |
|
1355 |
validateTree(l.head, checkRaw, isOuter); |
|
1356 |
} |
|
17583
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1357 |
} |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1358 |
|
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1359 |
void checkRaw(JCTree tree, Env<AttrContext> env) { |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1360 |
if (lint.isEnabled(LintCategory.RAW) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1361 |
tree.type.hasTag(CLASS) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1362 |
!TreeInfo.isDiamond(tree) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1363 |
!withinAnonConstr(env) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1364 |
tree.type.isRaw()) { |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1365 |
log.warning(LintCategory.RAW, |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1366 |
tree.pos(), "raw.class.use", tree.type, tree.type.tsym.type); |
6351 | 1367 |
} |
17583
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1368 |
} |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1369 |
//where |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1370 |
private boolean withinAnonConstr(Env<AttrContext> env) { |
10721
ca322e50ddb7
7090499: missing rawtypes warnings in anonymous inner class
mcimadamore
parents:
10626
diff
changeset
|
1371 |
return env.enclClass.name.isEmpty() && |
ca322e50ddb7
7090499: missing rawtypes warnings in anonymous inner class
mcimadamore
parents:
10626
diff
changeset
|
1372 |
env.enclMethod != null && env.enclMethod.name == names.init; |
ca322e50ddb7
7090499: missing rawtypes warnings in anonymous inner class
mcimadamore
parents:
10626
diff
changeset
|
1373 |
} |
10 | 1374 |
|
1375 |
/* ************************************************************************* |
|
1376 |
* Exception checking |
|
1377 |
**************************************************************************/ |
|
1378 |
||
1379 |
/* The following methods treat classes as sets that contain |
|
1380 |
* the class itself and all their subclasses |
|
1381 |
*/ |
|
1382 |
||
1383 |
/** Is given type a subtype of some of the types in given list? |
|
1384 |
*/ |
|
1385 |
boolean subset(Type t, List<Type> ts) { |
|
1386 |
for (List<Type> l = ts; l.nonEmpty(); l = l.tail) |
|
1387 |
if (types.isSubtype(t, l.head)) return true; |
|
1388 |
return false; |
|
1389 |
} |
|
1390 |
||
1391 |
/** Is given type a subtype or supertype of |
|
1392 |
* some of the types in given list? |
|
1393 |
*/ |
|
1394 |
boolean intersects(Type t, List<Type> ts) { |
|
1395 |
for (List<Type> l = ts; l.nonEmpty(); l = l.tail) |
|
1396 |
if (types.isSubtype(t, l.head) || types.isSubtype(l.head, t)) return true; |
|
1397 |
return false; |
|
1398 |
} |
|
1399 |
||
1400 |
/** Add type set to given type list, unless it is a subclass of some class |
|
1401 |
* in the list. |
|
1402 |
*/ |
|
1403 |
List<Type> incl(Type t, List<Type> ts) { |
|
1404 |
return subset(t, ts) ? ts : excl(t, ts).prepend(t); |
|
1405 |
} |
|
1406 |
||
1407 |
/** Remove type set from type set list. |
|
1408 |
*/ |
|
1409 |
List<Type> excl(Type t, List<Type> ts) { |
|
1410 |
if (ts.isEmpty()) { |
|
1411 |
return ts; |
|
1412 |
} else { |
|
1413 |
List<Type> ts1 = excl(t, ts.tail); |
|
1414 |
if (types.isSubtype(ts.head, t)) return ts1; |
|
1415 |
else if (ts1 == ts.tail) return ts; |
|
1416 |
else return ts1.prepend(ts.head); |
|
1417 |
} |
|
1418 |
} |
|
1419 |
||
1420 |
/** Form the union of two type set lists. |
|
1421 |
*/ |
|
1422 |
List<Type> union(List<Type> ts1, List<Type> ts2) { |
|
1423 |
List<Type> ts = ts1; |
|
1424 |
for (List<Type> l = ts2; l.nonEmpty(); l = l.tail) |
|
1425 |
ts = incl(l.head, ts); |
|
1426 |
return ts; |
|
1427 |
} |
|
1428 |
||
1429 |
/** Form the difference of two type lists. |
|
1430 |
*/ |
|
1431 |
List<Type> diff(List<Type> ts1, List<Type> ts2) { |
|
1432 |
List<Type> ts = ts1; |
|
1433 |
for (List<Type> l = ts2; l.nonEmpty(); l = l.tail) |
|
1434 |
ts = excl(l.head, ts); |
|
1435 |
return ts; |
|
1436 |
} |
|
1437 |
||
1438 |
/** Form the intersection of two type lists. |
|
1439 |
*/ |
|
1440 |
public List<Type> intersect(List<Type> ts1, List<Type> ts2) { |
|
1441 |
List<Type> ts = List.nil(); |
|
1442 |
for (List<Type> l = ts1; l.nonEmpty(); l = l.tail) |
|
1443 |
if (subset(l.head, ts2)) ts = incl(l.head, ts); |
|
1444 |
for (List<Type> l = ts2; l.nonEmpty(); l = l.tail) |
|
1445 |
if (subset(l.head, ts1)) ts = incl(l.head, ts); |
|
1446 |
return ts; |
|
1447 |
} |
|
1448 |
||
1449 |
/** Is exc an exception symbol that need not be declared? |
|
1450 |
*/ |
|
1451 |
boolean isUnchecked(ClassSymbol exc) { |
|
1452 |
return |
|
1453 |
exc.kind == ERR || |
|
1454 |
exc.isSubClass(syms.errorType.tsym, types) || |
|
1455 |
exc.isSubClass(syms.runtimeExceptionType.tsym, types); |
|
1456 |
} |
|
1457 |
||
1458 |
/** Is exc an exception type that need not be declared? |
|
1459 |
*/ |
|
1460 |
boolean isUnchecked(Type exc) { |
|
1461 |
return |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1462 |
(exc.hasTag(TYPEVAR)) ? isUnchecked(types.supertype(exc)) : |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1463 |
(exc.hasTag(CLASS)) ? isUnchecked((ClassSymbol)exc.tsym) : |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1464 |
exc.hasTag(BOT); |
10 | 1465 |
} |
1466 |
||
1467 |
/** Same, but handling completion failures. |
|
1468 |
*/ |
|
1469 |
boolean isUnchecked(DiagnosticPosition pos, Type exc) { |
|
1470 |
try { |
|
1471 |
return isUnchecked(exc); |
|
1472 |
} catch (CompletionFailure ex) { |
|
1473 |
completionError(pos, ex); |
|
1474 |
return true; |
|
1475 |
} |
|
1476 |
} |
|
1477 |
||
1478 |
/** Is exc handled by given exception list? |
|
1479 |
*/ |
|
1480 |
boolean isHandled(Type exc, List<Type> handled) { |
|
1481 |
return isUnchecked(exc) || subset(exc, handled); |
|
1482 |
} |
|
1483 |
||
1484 |
/** Return all exceptions in thrown list that are not in handled list. |
|
1485 |
* @param thrown The list of thrown exceptions. |
|
1486 |
* @param handled The list of handled exceptions. |
|
1487 |
*/ |
|
3560 | 1488 |
List<Type> unhandled(List<Type> thrown, List<Type> handled) { |
10 | 1489 |
List<Type> unhandled = List.nil(); |
1490 |
for (List<Type> l = thrown; l.nonEmpty(); l = l.tail) |
|
1491 |
if (!isHandled(l.head, handled)) unhandled = unhandled.prepend(l.head); |
|
1492 |
return unhandled; |
|
1493 |
} |
|
1494 |
||
1495 |
/* ************************************************************************* |
|
1496 |
* Overriding/Implementation checking |
|
1497 |
**************************************************************************/ |
|
1498 |
||
1499 |
/** The level of access protection given by a flag set, |
|
1500 |
* where PRIVATE is highest and PUBLIC is lowest. |
|
1501 |
*/ |
|
1502 |
static int protection(long flags) { |
|
1503 |
switch ((short)(flags & AccessFlags)) { |
|
1504 |
case PRIVATE: return 3; |
|
1505 |
case PROTECTED: return 1; |
|
1506 |
default: |
|
1507 |
case PUBLIC: return 0; |
|
1508 |
case 0: return 2; |
|
1509 |
} |
|
1510 |
} |
|
1511 |
||
1512 |
/** A customized "cannot override" error message. |
|
1513 |
* @param m The overriding method. |
|
1514 |
* @param other The overridden method. |
|
1515 |
* @return An internationalized string. |
|
1516 |
*/ |
|
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
1517 |
Object cannotOverride(MethodSymbol m, MethodSymbol other) { |
10 | 1518 |
String key; |
1519 |
if ((other.owner.flags() & INTERFACE) == 0) |
|
1520 |
key = "cant.override"; |
|
1521 |
else if ((m.owner.flags() & INTERFACE) == 0) |
|
1522 |
key = "cant.implement"; |
|
1523 |
else |
|
1524 |
key = "clashes.with"; |
|
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
1525 |
return diags.fragment(key, m, m.location(), other, other.location()); |
10 | 1526 |
} |
1527 |
||
1528 |
/** A customized "override" warning message. |
|
1529 |
* @param m The overriding method. |
|
1530 |
* @param other The overridden method. |
|
1531 |
* @return An internationalized string. |
|
1532 |
*/ |
|
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
1533 |
Object uncheckedOverrides(MethodSymbol m, MethodSymbol other) { |
10 | 1534 |
String key; |
1535 |
if ((other.owner.flags() & INTERFACE) == 0) |
|
1536 |
key = "unchecked.override"; |
|
1537 |
else if ((m.owner.flags() & INTERFACE) == 0) |
|
1538 |
key = "unchecked.implement"; |
|
1539 |
else |
|
1540 |
key = "unchecked.clash.with"; |
|
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
1541 |
return diags.fragment(key, m, m.location(), other, other.location()); |
10 | 1542 |
} |
1543 |
||
1544 |
/** A customized "override" warning message. |
|
1545 |
* @param m The overriding method. |
|
1546 |
* @param other The overridden method. |
|
1547 |
* @return An internationalized string. |
|
1548 |
*/ |
|
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
1549 |
Object varargsOverrides(MethodSymbol m, MethodSymbol other) { |
10 | 1550 |
String key; |
1551 |
if ((other.owner.flags() & INTERFACE) == 0) |
|
1552 |
key = "varargs.override"; |
|
1553 |
else if ((m.owner.flags() & INTERFACE) == 0) |
|
1554 |
key = "varargs.implement"; |
|
1555 |
else |
|
1556 |
key = "varargs.clash.with"; |
|
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
1557 |
return diags.fragment(key, m, m.location(), other, other.location()); |
10 | 1558 |
} |
1559 |
||
1560 |
/** Check that this method conforms with overridden method 'other'. |
|
1561 |
* where `origin' is the class where checking started. |
|
1562 |
* Complications: |
|
1563 |
* (1) Do not check overriding of synthetic methods |
|
1564 |
* (reason: they might be final). |
|
1565 |
* todo: check whether this is still necessary. |
|
1566 |
* (2) Admit the case where an interface proxy throws fewer exceptions |
|
1567 |
* than the method it implements. Augment the proxy methods with the |
|
1568 |
* undeclared exceptions in this case. |
|
1569 |
* (3) When generics are enabled, admit the case where an interface proxy |
|
1570 |
* has a result type |
|
1571 |
* extended by the result type of the method it implements. |
|
1572 |
* Change the proxies result type to the smaller type in this case. |
|
1573 |
* |
|
1574 |
* @param tree The tree from which positions |
|
1575 |
* are extracted for errors. |
|
1576 |
* @param m The overriding method. |
|
1577 |
* @param other The overridden method. |
|
1578 |
* @param origin The class of which the overriding method |
|
1579 |
* is a member. |
|
1580 |
*/ |
|
1581 |
void checkOverride(JCTree tree, |
|
1582 |
MethodSymbol m, |
|
1583 |
MethodSymbol other, |
|
1584 |
ClassSymbol origin) { |
|
1585 |
// Don't check overriding of synthetic methods or by bridge methods. |
|
1586 |
if ((m.flags() & (SYNTHETIC|BRIDGE)) != 0 || (other.flags() & SYNTHETIC) != 0) { |
|
1587 |
return; |
|
1588 |
} |
|
1589 |
||
1590 |
// Error if static method overrides instance method (JLS 8.4.6.2). |
|
1591 |
if ((m.flags() & STATIC) != 0 && |
|
1592 |
(other.flags() & STATIC) == 0) { |
|
1593 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), "override.static", |
|
1594 |
cannotOverride(m, other)); |
|
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1595 |
m.flags_field |= BAD_OVERRIDE; |
10 | 1596 |
return; |
1597 |
} |
|
1598 |
||
1599 |
// Error if instance method overrides static or final |
|
1600 |
// method (JLS 8.4.6.1). |
|
1601 |
if ((other.flags() & FINAL) != 0 || |
|
1602 |
(m.flags() & STATIC) == 0 && |
|
1603 |
(other.flags() & STATIC) != 0) { |
|
1604 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), "override.meth", |
|
1605 |
cannotOverride(m, other), |
|
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
938
diff
changeset
|
1606 |
asFlagSet(other.flags() & (FINAL | STATIC))); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1607 |
m.flags_field |= BAD_OVERRIDE; |
10 | 1608 |
return; |
1609 |
} |
|
1610 |
||
1611 |
if ((m.owner.flags() & ANNOTATION) != 0) { |
|
1612 |
// handled in validateAnnotationMethod |
|
1613 |
return; |
|
1614 |
} |
|
1615 |
||
1616 |
// Error if overriding method has weaker access (JLS 8.4.6.3). |
|
1617 |
if ((origin.flags() & INTERFACE) == 0 && |
|
1618 |
protection(m.flags()) > protection(other.flags())) { |
|
1619 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), "override.weaker.access", |
|
1620 |
cannotOverride(m, other), |
|
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
938
diff
changeset
|
1621 |
other.flags() == 0 ? |
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
938
diff
changeset
|
1622 |
Flag.PACKAGE : |
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
938
diff
changeset
|
1623 |
asFlagSet(other.flags() & AccessFlags)); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1624 |
m.flags_field |= BAD_OVERRIDE; |
10 | 1625 |
return; |
1626 |
} |
|
1627 |
||
1628 |
Type mt = types.memberType(origin.type, m); |
|
1629 |
Type ot = types.memberType(origin.type, other); |
|
1630 |
// Error if overriding result type is different |
|
1631 |
// (or, in the case of generics mode, not a subtype) of |
|
1632 |
// overridden result type. We have to rename any type parameters |
|
1633 |
// before comparing types. |
|
1634 |
List<Type> mtvars = mt.getTypeArguments(); |
|
1635 |
List<Type> otvars = ot.getTypeArguments(); |
|
1636 |
Type mtres = mt.getReturnType(); |
|
1637 |
Type otres = types.subst(ot.getReturnType(), otvars, mtvars); |
|
1638 |
||
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
1639 |
overrideWarner.clear(); |
10 | 1640 |
boolean resultTypesOK = |
1874 | 1641 |
types.returnTypeSubstitutable(mt, ot, otres, overrideWarner); |
10 | 1642 |
if (!resultTypesOK) { |
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1643 |
if (!allowCovariantReturns && |
10 | 1644 |
m.owner != origin && |
1645 |
m.owner.isSubClass(other.owner, types)) { |
|
1646 |
// allow limited interoperability with covariant returns |
|
1647 |
} else { |
|
3560 | 1648 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
1649 |
"override.incompatible.ret", |
|
1650 |
cannotOverride(m, other), |
|
10 | 1651 |
mtres, otres); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1652 |
m.flags_field |= BAD_OVERRIDE; |
10 | 1653 |
return; |
1654 |
} |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
1655 |
} else if (overrideWarner.hasNonSilentLint(LintCategory.UNCHECKED)) { |
10 | 1656 |
warnUnchecked(TreeInfo.diagnosticPositionFor(m, tree), |
3560 | 1657 |
"override.unchecked.ret", |
1658 |
uncheckedOverrides(m, other), |
|
1659 |
mtres, otres); |
|
10 | 1660 |
} |
1661 |
||
1662 |
// Error if overriding method throws an exception not reported |
|
1663 |
// by overridden method. |
|
1664 |
List<Type> otthrown = types.subst(ot.getThrownTypes(), otvars, mtvars); |
|
3560 | 1665 |
List<Type> unhandledErased = unhandled(mt.getThrownTypes(), types.erasure(otthrown)); |
1666 |
List<Type> unhandledUnerased = unhandled(mt.getThrownTypes(), otthrown); |
|
1667 |
if (unhandledErased.nonEmpty()) { |
|
10 | 1668 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
1669 |
"override.meth.doesnt.throw", |
|
1670 |
cannotOverride(m, other), |
|
3560 | 1671 |
unhandledUnerased.head); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1672 |
m.flags_field |= BAD_OVERRIDE; |
3560 | 1673 |
return; |
1674 |
} |
|
1675 |
else if (unhandledUnerased.nonEmpty()) { |
|
1676 |
warnUnchecked(TreeInfo.diagnosticPositionFor(m, tree), |
|
1677 |
"override.unchecked.thrown", |
|
1678 |
cannotOverride(m, other), |
|
1679 |
unhandledUnerased.head); |
|
10 | 1680 |
return; |
1681 |
} |
|
1682 |
||
1683 |
// Optional warning if varargs don't agree |
|
1684 |
if ((((m.flags() ^ other.flags()) & Flags.VARARGS) != 0) |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
1685 |
&& lint.isEnabled(LintCategory.OVERRIDES)) { |
10 | 1686 |
log.warning(TreeInfo.diagnosticPositionFor(m, tree), |
1687 |
((m.flags() & Flags.VARARGS) != 0) |
|
1688 |
? "override.varargs.missing" |
|
1689 |
: "override.varargs.extra", |
|
1690 |
varargsOverrides(m, other)); |
|
1691 |
} |
|
1692 |
||
1693 |
// Warn if instance method overrides bridge method (compiler spec ??) |
|
1694 |
if ((other.flags() & BRIDGE) != 0) { |
|
1695 |
log.warning(TreeInfo.diagnosticPositionFor(m, tree), "override.bridge", |
|
1696 |
uncheckedOverrides(m, other)); |
|
1697 |
} |
|
1698 |
||
1699 |
// Warn if a deprecated method overridden by a non-deprecated one. |
|
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
1700 |
if (!isDeprecatedOverrideIgnorable(other, origin)) { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
1701 |
checkDeprecated(TreeInfo.diagnosticPositionFor(m, tree), m, other); |
10 | 1702 |
} |
1703 |
} |
|
1704 |
// where |
|
1705 |
private boolean isDeprecatedOverrideIgnorable(MethodSymbol m, ClassSymbol origin) { |
|
1706 |
// If the method, m, is defined in an interface, then ignore the issue if the method |
|
1707 |
// is only inherited via a supertype and also implemented in the supertype, |
|
1708 |
// because in that case, we will rediscover the issue when examining the method |
|
1709 |
// in the supertype. |
|
1710 |
// If the method, m, is not defined in an interface, then the only time we need to |
|
1711 |
// address the issue is when the method is the supertype implemementation: any other |
|
1712 |
// case, we will have dealt with when examining the supertype classes |
|
1713 |
ClassSymbol mc = m.enclClass(); |
|
1714 |
Type st = types.supertype(origin.type); |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1715 |
if (!st.hasTag(CLASS)) |
10 | 1716 |
return true; |
1717 |
MethodSymbol stimpl = m.implementation((ClassSymbol)st.tsym, types, false); |
|
1718 |
||
1719 |
if (mc != null && ((mc.flags() & INTERFACE) != 0)) { |
|
1720 |
List<Type> intfs = types.interfaces(origin.type); |
|
1721 |
return (intfs.contains(mc.type) ? false : (stimpl != null)); |
|
1722 |
} |
|
1723 |
else |
|
1724 |
return (stimpl != m); |
|
1725 |
} |
|
1726 |
||
1727 |
||
1728 |
// used to check if there were any unchecked conversions |
|
1729 |
Warner overrideWarner = new Warner(); |
|
1730 |
||
1731 |
/** Check that a class does not inherit two concrete methods |
|
1732 |
* with the same signature. |
|
1733 |
* @param pos Position to be used for error reporting. |
|
1734 |
* @param site The class type to be checked. |
|
1735 |
*/ |
|
1736 |
public void checkCompatibleConcretes(DiagnosticPosition pos, Type site) { |
|
1737 |
Type sup = types.supertype(site); |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1738 |
if (!sup.hasTag(CLASS)) return; |
10 | 1739 |
|
1740 |
for (Type t1 = sup; |
|
1741 |
t1.tsym.type.isParameterized(); |
|
1742 |
t1 = types.supertype(t1)) { |
|
1743 |
for (Scope.Entry e1 = t1.tsym.members().elems; |
|
1744 |
e1 != null; |
|
1745 |
e1 = e1.sibling) { |
|
1746 |
Symbol s1 = e1.sym; |
|
1747 |
if (s1.kind != MTH || |
|
1748 |
(s1.flags() & (STATIC|SYNTHETIC|BRIDGE)) != 0 || |
|
1749 |
!s1.isInheritedIn(site.tsym, types) || |
|
1750 |
((MethodSymbol)s1).implementation(site.tsym, |
|
1751 |
types, |
|
1752 |
true) != s1) |
|
1753 |
continue; |
|
1754 |
Type st1 = types.memberType(t1, s1); |
|
1755 |
int s1ArgsLength = st1.getParameterTypes().length(); |
|
1756 |
if (st1 == s1.type) continue; |
|
1757 |
||
1758 |
for (Type t2 = sup; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1759 |
t2.hasTag(CLASS); |
10 | 1760 |
t2 = types.supertype(t2)) { |
508
118e500e2e50
5009937: hiding versus generics versus binary compatibility
mcimadamore
parents:
169
diff
changeset
|
1761 |
for (Scope.Entry e2 = t2.tsym.members().lookup(s1.name); |
10 | 1762 |
e2.scope != null; |
1763 |
e2 = e2.next()) { |
|
1764 |
Symbol s2 = e2.sym; |
|
1765 |
if (s2 == s1 || |
|
1766 |
s2.kind != MTH || |
|
1767 |
(s2.flags() & (STATIC|SYNTHETIC|BRIDGE)) != 0 || |
|
1768 |
s2.type.getParameterTypes().length() != s1ArgsLength || |
|
1769 |
!s2.isInheritedIn(site.tsym, types) || |
|
1770 |
((MethodSymbol)s2).implementation(site.tsym, |
|
1771 |
types, |
|
1772 |
true) != s2) |
|
1773 |
continue; |
|
1774 |
Type st2 = types.memberType(t2, s2); |
|
1775 |
if (types.overrideEquivalent(st1, st2)) |
|
1776 |
log.error(pos, "concrete.inheritance.conflict", |
|
1777 |
s1, t1, s2, t2, sup); |
|
1778 |
} |
|
1779 |
} |
|
1780 |
} |
|
1781 |
} |
|
1782 |
} |
|
1783 |
||
1784 |
/** Check that classes (or interfaces) do not each define an abstract |
|
1785 |
* method with same name and arguments but incompatible return types. |
|
1786 |
* @param pos Position to be used for error reporting. |
|
1787 |
* @param t1 The first argument type. |
|
1788 |
* @param t2 The second argument type. |
|
1789 |
*/ |
|
1790 |
public boolean checkCompatibleAbstracts(DiagnosticPosition pos, |
|
1791 |
Type t1, |
|
1792 |
Type t2) { |
|
1793 |
return checkCompatibleAbstracts(pos, t1, t2, |
|
1794 |
types.makeCompoundType(t1, t2)); |
|
1795 |
} |
|
1796 |
||
1797 |
public boolean checkCompatibleAbstracts(DiagnosticPosition pos, |
|
1798 |
Type t1, |
|
1799 |
Type t2, |
|
1800 |
Type site) { |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1801 |
return firstIncompatibility(pos, t1, t2, site) == null; |
10 | 1802 |
} |
1803 |
||
1804 |
/** Return the first method which is defined with same args |
|
1805 |
* but different return types in two given interfaces, or null if none |
|
1806 |
* exists. |
|
1807 |
* @param t1 The first type. |
|
1808 |
* @param t2 The second type. |
|
1809 |
* @param site The most derived type. |
|
1810 |
* @returns symbol from t2 that conflicts with one in t1. |
|
1811 |
*/ |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1812 |
private Symbol firstIncompatibility(DiagnosticPosition pos, Type t1, Type t2, Type site) { |
10 | 1813 |
Map<TypeSymbol,Type> interfaces1 = new HashMap<TypeSymbol,Type>(); |
1814 |
closure(t1, interfaces1); |
|
1815 |
Map<TypeSymbol,Type> interfaces2; |
|
1816 |
if (t1 == t2) |
|
1817 |
interfaces2 = interfaces1; |
|
1818 |
else |
|
1819 |
closure(t2, interfaces1, interfaces2 = new HashMap<TypeSymbol,Type>()); |
|
1820 |
||
1821 |
for (Type t3 : interfaces1.values()) { |
|
1822 |
for (Type t4 : interfaces2.values()) { |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1823 |
Symbol s = firstDirectIncompatibility(pos, t3, t4, site); |
10 | 1824 |
if (s != null) return s; |
1825 |
} |
|
1826 |
} |
|
1827 |
return null; |
|
1828 |
} |
|
1829 |
||
1830 |
/** Compute all the supertypes of t, indexed by type symbol. */ |
|
1831 |
private void closure(Type t, Map<TypeSymbol,Type> typeMap) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1832 |
if (!t.hasTag(CLASS)) return; |
10 | 1833 |
if (typeMap.put(t.tsym, t) == null) { |
1834 |
closure(types.supertype(t), typeMap); |
|
1835 |
for (Type i : types.interfaces(t)) |
|
1836 |
closure(i, typeMap); |
|
1837 |
} |
|
1838 |
} |
|
1839 |
||
1840 |
/** Compute all the supertypes of t, indexed by type symbol (except thise in typesSkip). */ |
|
1841 |
private void closure(Type t, Map<TypeSymbol,Type> typesSkip, Map<TypeSymbol,Type> typeMap) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1842 |
if (!t.hasTag(CLASS)) return; |
10 | 1843 |
if (typesSkip.get(t.tsym) != null) return; |
1844 |
if (typeMap.put(t.tsym, t) == null) { |
|
1845 |
closure(types.supertype(t), typesSkip, typeMap); |
|
1846 |
for (Type i : types.interfaces(t)) |
|
1847 |
closure(i, typesSkip, typeMap); |
|
1848 |
} |
|
1849 |
} |
|
1850 |
||
1851 |
/** Return the first method in t2 that conflicts with a method from t1. */ |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1852 |
private Symbol firstDirectIncompatibility(DiagnosticPosition pos, Type t1, Type t2, Type site) { |
10 | 1853 |
for (Scope.Entry e1 = t1.tsym.members().elems; e1 != null; e1 = e1.sibling) { |
1854 |
Symbol s1 = e1.sym; |
|
1855 |
Type st1 = null; |
|
14800
4bed1223fdf2
8004094: Javac compiler error - synthetic method accessor generated with duplicate name
mcimadamore
parents:
14547
diff
changeset
|
1856 |
if (s1.kind != MTH || !s1.isInheritedIn(site.tsym, types) || |
4bed1223fdf2
8004094: Javac compiler error - synthetic method accessor generated with duplicate name
mcimadamore
parents:
14547
diff
changeset
|
1857 |
(s1.flags() & SYNTHETIC) != 0) continue; |
10 | 1858 |
Symbol impl = ((MethodSymbol)s1).implementation(site.tsym, types, false); |
1859 |
if (impl != null && (impl.flags() & ABSTRACT) == 0) continue; |
|
1860 |
for (Scope.Entry e2 = t2.tsym.members().lookup(s1.name); e2.scope != null; e2 = e2.next()) { |
|
1861 |
Symbol s2 = e2.sym; |
|
1862 |
if (s1 == s2) continue; |
|
14800
4bed1223fdf2
8004094: Javac compiler error - synthetic method accessor generated with duplicate name
mcimadamore
parents:
14547
diff
changeset
|
1863 |
if (s2.kind != MTH || !s2.isInheritedIn(site.tsym, types) || |
4bed1223fdf2
8004094: Javac compiler error - synthetic method accessor generated with duplicate name
mcimadamore
parents:
14547
diff
changeset
|
1864 |
(s2.flags() & SYNTHETIC) != 0) continue; |
10 | 1865 |
if (st1 == null) st1 = types.memberType(t1, s1); |
1866 |
Type st2 = types.memberType(t2, s2); |
|
1867 |
if (types.overrideEquivalent(st1, st2)) { |
|
1868 |
List<Type> tvars1 = st1.getTypeArguments(); |
|
1869 |
List<Type> tvars2 = st2.getTypeArguments(); |
|
1870 |
Type rt1 = st1.getReturnType(); |
|
1871 |
Type rt2 = types.subst(st2.getReturnType(), tvars2, tvars1); |
|
1872 |
boolean compat = |
|
1873 |
types.isSameType(rt1, rt2) || |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1874 |
!rt1.isPrimitiveOrVoid() && |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1875 |
!rt2.isPrimitiveOrVoid() && |
14547 | 1876 |
(types.covariantReturnType(rt1, rt2, types.noWarnings) || |
1877 |
types.covariantReturnType(rt2, rt1, types.noWarnings)) || |
|
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1878 |
checkCommonOverriderIn(s1,s2,site); |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1879 |
if (!compat) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1880 |
log.error(pos, "types.incompatible.diff.ret", |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1881 |
t1, t2, s2.name + |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1882 |
"(" + types.memberType(t2, s2).getParameterTypes() + ")"); |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1883 |
return s2; |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1884 |
} |
8610
62e3274feecc
7020657: Javac rejects a fairly common idiom with raw override and interfaces
mcimadamore
parents:
8427
diff
changeset
|
1885 |
} else if (checkNameClash((ClassSymbol)site.tsym, s1, s2) && |
62e3274feecc
7020657: Javac rejects a fairly common idiom with raw override and interfaces
mcimadamore
parents:
8427
diff
changeset
|
1886 |
!checkCommonOverriderIn(s1, s2, site)) { |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1887 |
log.error(pos, |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1888 |
"name.clash.same.erasure.no.override", |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1889 |
s1, s1.location(), |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1890 |
s2, s2.location()); |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1891 |
return s2; |
10 | 1892 |
} |
1893 |
} |
|
1894 |
} |
|
1895 |
return null; |
|
1896 |
} |
|
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1897 |
//WHERE |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1898 |
boolean checkCommonOverriderIn(Symbol s1, Symbol s2, Type site) { |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1899 |
Map<TypeSymbol,Type> supertypes = new HashMap<TypeSymbol,Type>(); |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1900 |
Type st1 = types.memberType(site, s1); |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1901 |
Type st2 = types.memberType(site, s2); |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1902 |
closure(site, supertypes); |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1903 |
for (Type t : supertypes.values()) { |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1904 |
for (Scope.Entry e = t.tsym.members().lookup(s1.name); e.scope != null; e = e.next()) { |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1905 |
Symbol s3 = e.sym; |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1906 |
if (s3 == s1 || s3 == s2 || s3.kind != MTH || (s3.flags() & (BRIDGE|SYNTHETIC)) != 0) continue; |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1907 |
Type st3 = types.memberType(site,s3); |
18380
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
1908 |
if (types.overrideEquivalent(st3, st1) && |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
1909 |
types.overrideEquivalent(st3, st2) && |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
1910 |
types.returnTypeSubstitutable(st3, st1) && |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
1911 |
types.returnTypeSubstitutable(st3, st2)) { |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
1912 |
return true; |
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1913 |
} |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1914 |
} |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1915 |
} |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1916 |
return false; |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1917 |
} |
10 | 1918 |
|
1919 |
/** Check that a given method conforms with any method it overrides. |
|
1920 |
* @param tree The tree from which positions are extracted |
|
1921 |
* for errors. |
|
1922 |
* @param m The overriding method. |
|
1923 |
*/ |
|
1924 |
void checkOverride(JCTree tree, MethodSymbol m) { |
|
1925 |
ClassSymbol origin = (ClassSymbol)m.owner; |
|
1926 |
if ((origin.flags() & ENUM) != 0 && names.finalize.equals(m.name)) |
|
1927 |
if (m.overrides(syms.enumFinalFinalize, origin, types, false)) { |
|
1928 |
log.error(tree.pos(), "enum.no.finalize"); |
|
1929 |
return; |
|
1930 |
} |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1931 |
for (Type t = origin.type; t.hasTag(CLASS); |
10 | 1932 |
t = types.supertype(t)) { |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1933 |
if (t != origin.type) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1934 |
checkOverride(tree, t, origin, m); |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1935 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1936 |
for (Type t2 : types.interfaces(t)) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1937 |
checkOverride(tree, t2, origin, m); |
10 | 1938 |
} |
1939 |
} |
|
1940 |
} |
|
1941 |
||
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1942 |
void checkOverride(JCTree tree, Type site, ClassSymbol origin, MethodSymbol m) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1943 |
TypeSymbol c = site.tsym; |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1944 |
Scope.Entry e = c.members().lookup(m.name); |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1945 |
while (e.scope != null) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1946 |
if (m.overrides(e.sym, origin, types, false)) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1947 |
if ((e.sym.flags() & ABSTRACT) == 0) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1948 |
checkOverride(tree, m, (MethodSymbol)e.sym, origin); |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1949 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1950 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1951 |
e = e.next(); |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1952 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1953 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1954 |
|
16320
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1955 |
private Filter<Symbol> equalsHasCodeFilter = new Filter<Symbol>() { |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1956 |
public boolean accepts(Symbol s) { |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1957 |
return MethodSymbol.implementation_filter.accepts(s) && |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1958 |
(s.flags() & BAD_OVERRIDE) == 0; |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1959 |
|
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1960 |
} |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1961 |
}; |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1962 |
|
16333 | 1963 |
public void checkClassOverrideEqualsAndHashIfNeeded(DiagnosticPosition pos, |
1964 |
ClassSymbol someClass) { |
|
1965 |
/* At present, annotations cannot possibly have a method that is override |
|
1966 |
* equivalent with Object.equals(Object) but in any case the condition is |
|
1967 |
* fine for completeness. |
|
1968 |
*/ |
|
1969 |
if (someClass == (ClassSymbol)syms.objectType.tsym || |
|
1970 |
someClass.isInterface() || someClass.isEnum() || |
|
1971 |
(someClass.flags() & ANNOTATION) != 0 || |
|
1972 |
(someClass.flags() & ABSTRACT) != 0) return; |
|
1973 |
//anonymous inner classes implementing interfaces need especial treatment |
|
1974 |
if (someClass.isAnonymous()) { |
|
1975 |
List<Type> interfaces = types.interfaces(someClass.type); |
|
1976 |
if (interfaces != null && !interfaces.isEmpty() && |
|
1977 |
interfaces.head.tsym == syms.comparatorType.tsym) return; |
|
1978 |
} |
|
1979 |
checkClassOverrideEqualsAndHash(pos, someClass); |
|
1980 |
} |
|
1981 |
||
1982 |
private void checkClassOverrideEqualsAndHash(DiagnosticPosition pos, |
|
16320
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1983 |
ClassSymbol someClass) { |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1984 |
if (lint.isEnabled(LintCategory.OVERRIDES)) { |
16320
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1985 |
MethodSymbol equalsAtObject = (MethodSymbol)syms.objectType |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1986 |
.tsym.members().lookup(names.equals).sym; |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1987 |
MethodSymbol hashCodeAtObject = (MethodSymbol)syms.objectType |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1988 |
.tsym.members().lookup(names.hashCode).sym; |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1989 |
boolean overridesEquals = types.implementation(equalsAtObject, |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1990 |
someClass, false, equalsHasCodeFilter).owner == someClass; |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1991 |
boolean overridesHashCode = types.implementation(hashCodeAtObject, |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1992 |
someClass, false, equalsHasCodeFilter) != hashCodeAtObject; |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1993 |
|
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1994 |
if (overridesEquals && !overridesHashCode) { |
92ba27b7aaf3
8008436: javac should not issue a warning for overriding equals without hasCode if hashCode has been overriden by a superclass
vromero
parents:
16316
diff
changeset
|
1995 |
log.warning(LintCategory.OVERRIDES, pos, |
16333 | 1996 |
"override.equals.but.not.hashcode", someClass); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1997 |
} |
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1998 |
} |
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1999 |
} |
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
2000 |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2001 |
private boolean checkNameClash(ClassSymbol origin, Symbol s1, Symbol s2) { |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2002 |
ClashFilter cf = new ClashFilter(origin.type); |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2003 |
return (cf.accepts(s1) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2004 |
cf.accepts(s2) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2005 |
types.hasSameArgs(s1.erasure(types), s2.erasure(types))); |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2006 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2007 |
|
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2008 |
|
10 | 2009 |
/** Check that all abstract members of given class have definitions. |
2010 |
* @param pos Position to be used for error reporting. |
|
2011 |
* @param c The class. |
|
2012 |
*/ |
|
2013 |
void checkAllDefined(DiagnosticPosition pos, ClassSymbol c) { |
|
2014 |
try { |
|
2015 |
MethodSymbol undef = firstUndef(c, c); |
|
2016 |
if (undef != null) { |
|
2017 |
if ((c.flags() & ENUM) != 0 && |
|
2018 |
types.supertype(c.type).tsym == syms.enumSym && |
|
2019 |
(c.flags() & FINAL) == 0) { |
|
2020 |
// add the ABSTRACT flag to an enum |
|
2021 |
c.flags_field |= ABSTRACT; |
|
2022 |
} else { |
|
2023 |
MethodSymbol undef1 = |
|
2024 |
new MethodSymbol(undef.flags(), undef.name, |
|
2025 |
types.memberType(c.type, undef), undef.owner); |
|
2026 |
log.error(pos, "does.not.override.abstract", |
|
2027 |
c, undef1, undef1.location()); |
|
2028 |
} |
|
2029 |
} |
|
2030 |
} catch (CompletionFailure ex) { |
|
2031 |
completionError(pos, ex); |
|
2032 |
} |
|
2033 |
} |
|
2034 |
//where |
|
2035 |
/** Return first abstract member of class `c' that is not defined |
|
2036 |
* in `impl', null if there is none. |
|
2037 |
*/ |
|
2038 |
private MethodSymbol firstUndef(ClassSymbol impl, ClassSymbol c) { |
|
2039 |
MethodSymbol undef = null; |
|
2040 |
// Do not bother to search in classes that are not abstract, |
|
2041 |
// since they cannot have abstract members. |
|
2042 |
if (c == impl || (c.flags() & (ABSTRACT | INTERFACE)) != 0) { |
|
2043 |
Scope s = c.members(); |
|
2044 |
for (Scope.Entry e = s.elems; |
|
2045 |
undef == null && e != null; |
|
2046 |
e = e.sibling) { |
|
2047 |
if (e.sym.kind == MTH && |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2048 |
(e.sym.flags() & (ABSTRACT|IPROXY|DEFAULT)) == ABSTRACT) { |
10 | 2049 |
MethodSymbol absmeth = (MethodSymbol)e.sym; |
2050 |
MethodSymbol implmeth = absmeth.implementation(impl, types, true); |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2051 |
if (implmeth == null || implmeth == absmeth) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2052 |
//look for default implementations |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2053 |
if (allowDefaultMethods) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2054 |
MethodSymbol prov = types.interfaceCandidates(impl.type, absmeth).head; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2055 |
if (prov != null && prov.overrides(absmeth, impl, types, true)) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2056 |
implmeth = prov; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2057 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2058 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2059 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2060 |
if (implmeth == null || implmeth == absmeth) { |
10 | 2061 |
undef = absmeth; |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2062 |
} |
10 | 2063 |
} |
2064 |
} |
|
2065 |
if (undef == null) { |
|
2066 |
Type st = types.supertype(c.type); |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2067 |
if (st.hasTag(CLASS)) |
10 | 2068 |
undef = firstUndef(impl, (ClassSymbol)st.tsym); |
2069 |
} |
|
2070 |
for (List<Type> l = types.interfaces(c.type); |
|
2071 |
undef == null && l.nonEmpty(); |
|
2072 |
l = l.tail) { |
|
2073 |
undef = firstUndef(impl, (ClassSymbol)l.head.tsym); |
|
2074 |
} |
|
2075 |
} |
|
2076 |
return undef; |
|
2077 |
} |
|
2078 |
||
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2079 |
void checkNonCyclicDecl(JCClassDecl tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2080 |
CycleChecker cc = new CycleChecker(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2081 |
cc.scan(tree); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2082 |
if (!cc.errorFound && !cc.partialCheck) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2083 |
tree.sym.flags_field |= ACYCLIC; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2084 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2085 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2086 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2087 |
class CycleChecker extends TreeScanner { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2088 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2089 |
List<Symbol> seenClasses = List.nil(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2090 |
boolean errorFound = false; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2091 |
boolean partialCheck = false; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2092 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2093 |
private void checkSymbol(DiagnosticPosition pos, Symbol sym) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2094 |
if (sym != null && sym.kind == TYP) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2095 |
Env<AttrContext> classEnv = enter.getEnv((TypeSymbol)sym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2096 |
if (classEnv != null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2097 |
DiagnosticSource prevSource = log.currentSource(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2098 |
try { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2099 |
log.useSource(classEnv.toplevel.sourcefile); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2100 |
scan(classEnv.tree); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2101 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2102 |
finally { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2103 |
log.useSource(prevSource.getFile()); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2104 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2105 |
} else if (sym.kind == TYP) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2106 |
checkClass(pos, sym, List.<JCTree>nil()); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2107 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2108 |
} else { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2109 |
//not completed yet |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2110 |
partialCheck = true; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2111 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2112 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2113 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2114 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2115 |
public void visitSelect(JCFieldAccess tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2116 |
super.visitSelect(tree); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2117 |
checkSymbol(tree.pos(), tree.sym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2118 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2119 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2120 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2121 |
public void visitIdent(JCIdent tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2122 |
checkSymbol(tree.pos(), tree.sym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2123 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2124 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2125 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2126 |
public void visitTypeApply(JCTypeApply tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2127 |
scan(tree.clazz); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2128 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2129 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2130 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2131 |
public void visitTypeArray(JCArrayTypeTree tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2132 |
scan(tree.elemtype); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2133 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2134 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2135 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2136 |
public void visitClassDef(JCClassDecl tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2137 |
List<JCTree> supertypes = List.nil(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2138 |
if (tree.getExtendsClause() != null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2139 |
supertypes = supertypes.prepend(tree.getExtendsClause()); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2140 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2141 |
if (tree.getImplementsClause() != null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2142 |
for (JCTree intf : tree.getImplementsClause()) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2143 |
supertypes = supertypes.prepend(intf); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2144 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2145 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2146 |
checkClass(tree.pos(), tree.sym, supertypes); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2147 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2148 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2149 |
void checkClass(DiagnosticPosition pos, Symbol c, List<JCTree> supertypes) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2150 |
if ((c.flags_field & ACYCLIC) != 0) |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2151 |
return; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2152 |
if (seenClasses.contains(c)) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2153 |
errorFound = true; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2154 |
noteCyclic(pos, (ClassSymbol)c); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2155 |
} else if (!c.type.isErroneous()) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2156 |
try { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2157 |
seenClasses = seenClasses.prepend(c); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2158 |
if (c.type.hasTag(CLASS)) { |
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2159 |
if (supertypes.nonEmpty()) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2160 |
scan(supertypes); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2161 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2162 |
else { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2163 |
ClassType ct = (ClassType)c.type; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2164 |
if (ct.supertype_field == null || |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2165 |
ct.interfaces_field == null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2166 |
//not completed yet |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2167 |
partialCheck = true; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2168 |
return; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2169 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2170 |
checkSymbol(pos, ct.supertype_field.tsym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2171 |
for (Type intf : ct.interfaces_field) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2172 |
checkSymbol(pos, intf.tsym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2173 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2174 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2175 |
if (c.owner.kind == TYP) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2176 |
checkSymbol(pos, c.owner); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2177 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2178 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2179 |
} finally { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2180 |
seenClasses = seenClasses.tail; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2181 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2182 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2183 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2184 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2185 |
|
10 | 2186 |
/** Check for cyclic references. Issue an error if the |
2187 |
* symbol of the type referred to has a LOCKED flag set. |
|
2188 |
* |
|
2189 |
* @param pos Position to be used for error reporting. |
|
2190 |
* @param t The type referred to. |
|
2191 |
*/ |
|
2192 |
void checkNonCyclic(DiagnosticPosition pos, Type t) { |
|
2193 |
checkNonCyclicInternal(pos, t); |
|
2194 |
} |
|
2195 |
||
2196 |
||
2197 |
void checkNonCyclic(DiagnosticPosition pos, TypeVar t) { |
|
2219
03b1b17c4b2e
6804733: javac generates spourious diagnostics for ill-formed type-variable bounds
mcimadamore
parents:
1874
diff
changeset
|
2198 |
checkNonCyclic1(pos, t, List.<TypeVar>nil()); |
10 | 2199 |
} |
2200 |
||
2219
03b1b17c4b2e
6804733: javac generates spourious diagnostics for ill-formed type-variable bounds
mcimadamore
parents:
1874
diff
changeset
|
2201 |
private void checkNonCyclic1(DiagnosticPosition pos, Type t, List<TypeVar> seen) { |
10 | 2202 |
final TypeVar tv; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2203 |
if (t.hasTag(TYPEVAR) && (t.tsym.flags() & UNATTRIBUTED) != 0) |
661
9b2f1fe5c183
6677785: REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors
mcimadamore
parents:
508
diff
changeset
|
2204 |
return; |
10 | 2205 |
if (seen.contains(t)) { |
2206 |
tv = (TypeVar)t; |
|
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
2207 |
tv.bound = types.createErrorType(t); |
10 | 2208 |
log.error(pos, "cyclic.inheritance", t); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2209 |
} else if (t.hasTag(TYPEVAR)) { |
10 | 2210 |
tv = (TypeVar)t; |
2219
03b1b17c4b2e
6804733: javac generates spourious diagnostics for ill-formed type-variable bounds
mcimadamore
parents:
1874
diff
changeset
|
2211 |
seen = seen.prepend(tv); |
10 | 2212 |
for (Type b : types.getBounds(tv)) |
2213 |
checkNonCyclic1(pos, b, seen); |
|
2214 |
} |
|
2215 |
} |
|
2216 |
||
2217 |
/** Check for cyclic references. Issue an error if the |
|
2218 |
* symbol of the type referred to has a LOCKED flag set. |
|
2219 |
* |
|
2220 |
* @param pos Position to be used for error reporting. |
|
2221 |
* @param t The type referred to. |
|
2222 |
* @returns True if the check completed on all attributed classes |
|
2223 |
*/ |
|
2224 |
private boolean checkNonCyclicInternal(DiagnosticPosition pos, Type t) { |
|
2225 |
boolean complete = true; // was the check complete? |
|
2226 |
//- System.err.println("checkNonCyclicInternal("+t+");");//DEBUG |
|
2227 |
Symbol c = t.tsym; |
|
2228 |
if ((c.flags_field & ACYCLIC) != 0) return true; |
|
2229 |
||
2230 |
if ((c.flags_field & LOCKED) != 0) { |
|
2231 |
noteCyclic(pos, (ClassSymbol)c); |
|
2232 |
} else if (!c.type.isErroneous()) { |
|
2233 |
try { |
|
2234 |
c.flags_field |= LOCKED; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2235 |
if (c.type.hasTag(CLASS)) { |
10 | 2236 |
ClassType clazz = (ClassType)c.type; |
2237 |
if (clazz.interfaces_field != null) |
|
2238 |
for (List<Type> l=clazz.interfaces_field; l.nonEmpty(); l=l.tail) |
|
2239 |
complete &= checkNonCyclicInternal(pos, l.head); |
|
2240 |
if (clazz.supertype_field != null) { |
|
2241 |
Type st = clazz.supertype_field; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2242 |
if (st != null && st.hasTag(CLASS)) |
10 | 2243 |
complete &= checkNonCyclicInternal(pos, st); |
2244 |
} |
|
2245 |
if (c.owner.kind == TYP) |
|
2246 |
complete &= checkNonCyclicInternal(pos, c.owner.type); |
|
2247 |
} |
|
2248 |
} finally { |
|
2249 |
c.flags_field &= ~LOCKED; |
|
2250 |
} |
|
2251 |
} |
|
2252 |
if (complete) |
|
2253 |
complete = ((c.flags_field & UNATTRIBUTED) == 0) && c.completer == null; |
|
2254 |
if (complete) c.flags_field |= ACYCLIC; |
|
2255 |
return complete; |
|
2256 |
} |
|
2257 |
||
2258 |
/** Note that we found an inheritance cycle. */ |
|
2259 |
private void noteCyclic(DiagnosticPosition pos, ClassSymbol c) { |
|
2260 |
log.error(pos, "cyclic.inheritance", c); |
|
2261 |
for (List<Type> l=types.interfaces(c.type); l.nonEmpty(); l=l.tail) |
|
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
2262 |
l.head = types.createErrorType((ClassSymbol)l.head.tsym, Type.noType); |
10 | 2263 |
Type st = types.supertype(c.type); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2264 |
if (st.hasTag(CLASS)) |
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
2265 |
((ClassType)c.type).supertype_field = types.createErrorType((ClassSymbol)st.tsym, Type.noType); |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1040
diff
changeset
|
2266 |
c.type = types.createErrorType(c, c.type); |
10 | 2267 |
c.flags_field |= ACYCLIC; |
2268 |
} |
|
2269 |
||
18412 | 2270 |
/** |
2271 |
* Check that functional interface methods would make sense when seen |
|
2272 |
* from the perspective of the implementing class |
|
2273 |
*/ |
|
2274 |
void checkFunctionalInterface(JCTree tree, Type funcInterface) { |
|
2275 |
ClassType c = new ClassType(Type.noType, List.<Type>nil(), null); |
|
2276 |
ClassSymbol csym = new ClassSymbol(0, names.empty, c, syms.noSymbol); |
|
2277 |
c.interfaces_field = List.of(types.removeWildcards(funcInterface)); |
|
2278 |
c.supertype_field = syms.objectType; |
|
2279 |
c.tsym = csym; |
|
2280 |
csym.members_field = new Scope(csym); |
|
2281 |
Symbol descSym = types.findDescriptorSymbol(funcInterface.tsym); |
|
2282 |
Type descType = types.findDescriptorType(funcInterface); |
|
2283 |
csym.members_field.enter(new MethodSymbol(PUBLIC, descSym.name, descType, csym)); |
|
2284 |
csym.completer = null; |
|
2285 |
checkImplementations(tree, csym, csym); |
|
2286 |
} |
|
2287 |
||
10 | 2288 |
/** Check that all methods which implement some |
2289 |
* method conform to the method they implement. |
|
2290 |
* @param tree The class definition whose members are checked. |
|
2291 |
*/ |
|
2292 |
void checkImplementations(JCClassDecl tree) { |
|
14547 | 2293 |
checkImplementations(tree, tree.sym, tree.sym); |
10 | 2294 |
} |
15385 | 2295 |
//where |
10 | 2296 |
/** Check that all methods which implement some |
2297 |
* method in `ic' conform to the method they implement. |
|
2298 |
*/ |
|
14547 | 2299 |
void checkImplementations(JCTree tree, ClassSymbol origin, ClassSymbol ic) { |
10 | 2300 |
for (List<Type> l = types.closure(ic.type); l.nonEmpty(); l = l.tail) { |
2301 |
ClassSymbol lc = (ClassSymbol)l.head.tsym; |
|
2302 |
if ((allowGenerics || origin != lc) && (lc.flags() & ABSTRACT) != 0) { |
|
2303 |
for (Scope.Entry e=lc.members().elems; e != null; e=e.sibling) { |
|
2304 |
if (e.sym.kind == MTH && |
|
2305 |
(e.sym.flags() & (STATIC|ABSTRACT)) == ABSTRACT) { |
|
2306 |
MethodSymbol absmeth = (MethodSymbol)e.sym; |
|
2307 |
MethodSymbol implmeth = absmeth.implementation(origin, types, false); |
|
2308 |
if (implmeth != null && implmeth != absmeth && |
|
2309 |
(implmeth.owner.flags() & INTERFACE) == |
|
2310 |
(origin.flags() & INTERFACE)) { |
|
2311 |
// don't check if implmeth is in a class, yet |
|
2312 |
// origin is an interface. This case arises only |
|
2313 |
// if implmeth is declared in Object. The reason is |
|
2314 |
// that interfaces really don't inherit from |
|
2315 |
// Object it's just that the compiler represents |
|
2316 |
// things that way. |
|
2317 |
checkOverride(tree, implmeth, absmeth, origin); |
|
2318 |
} |
|
2319 |
} |
|
2320 |
} |
|
2321 |
} |
|
2322 |
} |
|
2323 |
} |
|
2324 |
||
2325 |
/** Check that all abstract methods implemented by a class are |
|
2326 |
* mutually compatible. |
|
2327 |
* @param pos Position to be used for error reporting. |
|
2328 |
* @param c The class whose interfaces are checked. |
|
2329 |
*/ |
|
2330 |
void checkCompatibleSupertypes(DiagnosticPosition pos, Type c) { |
|
2331 |
List<Type> supertypes = types.interfaces(c); |
|
2332 |
Type supertype = types.supertype(c); |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2333 |
if (supertype.hasTag(CLASS) && |
10 | 2334 |
(supertype.tsym.flags() & ABSTRACT) != 0) |
2335 |
supertypes = supertypes.prepend(supertype); |
|
2336 |
for (List<Type> l = supertypes; l.nonEmpty(); l = l.tail) { |
|
2337 |
if (allowGenerics && !l.head.getTypeArguments().isEmpty() && |
|
2338 |
!checkCompatibleAbstracts(pos, l.head, l.head, c)) |
|
2339 |
return; |
|
2340 |
for (List<Type> m = supertypes; m != l; m = m.tail) |
|
2341 |
if (!checkCompatibleAbstracts(pos, l.head, m.head, c)) |
|
2342 |
return; |
|
2343 |
} |
|
2344 |
checkCompatibleConcretes(pos, c); |
|
2345 |
} |
|
2346 |
||
3557
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2347 |
void checkConflicts(DiagnosticPosition pos, Symbol sym, TypeSymbol c) { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2348 |
for (Type ct = c.type; ct != Type.noType ; ct = types.supertype(ct)) { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2349 |
for (Scope.Entry e = ct.tsym.members().lookup(sym.name); e.scope == ct.tsym.members(); e = e.next()) { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2350 |
// VM allows methods and variables with differing types |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2351 |
if (sym.kind == e.sym.kind && |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2352 |
types.isSameType(types.erasure(sym.type), types.erasure(e.sym.type)) && |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2353 |
sym != e.sym && |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2354 |
(sym.flags() & Flags.SYNTHETIC) != (e.sym.flags() & Flags.SYNTHETIC) && |
6147
0074061d0efd
6964669: javac reports error on miranda methods
mcimadamore
parents:
6032
diff
changeset
|
2355 |
(sym.flags() & IPROXY) == 0 && (e.sym.flags() & IPROXY) == 0 && |
3557
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2356 |
(sym.flags() & BRIDGE) == 0 && (e.sym.flags() & BRIDGE) == 0) { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2357 |
syntheticError(pos, (e.sym.flags() & SYNTHETIC) == 0 ? e.sym : sym); |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2358 |
return; |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2359 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2360 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2361 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2362 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2363 |
|
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2364 |
/** Check that all non-override equivalent methods accessible from 'site' |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2365 |
* are mutually compatible (JLS 8.4.8/9.4.1). |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2366 |
* |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2367 |
* @param pos Position to be used for error reporting. |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2368 |
* @param site The class whose methods are checked. |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2369 |
* @param sym The method symbol to be checked. |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2370 |
*/ |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2371 |
void checkOverrideClashes(DiagnosticPosition pos, Type site, MethodSymbol sym) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2372 |
ClashFilter cf = new ClashFilter(site); |
11868
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2373 |
//for each method m1 that is overridden (directly or indirectly) |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2374 |
//by method 'sym' in 'site'... |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2375 |
for (Symbol m1 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) { |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2376 |
if (!sym.overrides(m1, site.tsym, types, false)) continue; |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2377 |
//...check each method m2 that is a member of 'site' |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2378 |
for (Symbol m2 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) { |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2379 |
if (m2 == m1) continue; |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2380 |
//if (i) the signature of 'sym' is not a subsignature of m1 (seen as |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2381 |
//a member of 'site') and (ii) m1 has the same erasure as m2, issue an error |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2382 |
if (!types.isSubSignature(sym.type, types.memberType(site, m2), allowStrictMethodClashCheck) && |
11868
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2383 |
types.hasSameArgs(m2.erasure(types), m1.erasure(types))) { |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2384 |
sym.flags_field |= CLASH; |
11868
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2385 |
String key = m1 == sym ? |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2386 |
"name.clash.same.erasure.no.override" : |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2387 |
"name.clash.same.erasure.no.override.1"; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2388 |
log.error(pos, |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2389 |
key, |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2390 |
sym, sym.location(), |
11868
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2391 |
m2, m2.location(), |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2392 |
m1, m1.location()); |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2393 |
return; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2394 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2395 |
} |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2396 |
} |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2397 |
} |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2398 |
|
8427
703181b01773
7017664: Add listeners infrastracture to javac scopes
mcimadamore
parents:
8242
diff
changeset
|
2399 |
|
703181b01773
7017664: Add listeners infrastracture to javac scopes
mcimadamore
parents:
8242
diff
changeset
|
2400 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2401 |
/** Check that all static methods accessible from 'site' are |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2402 |
* mutually compatible (JLS 8.4.8). |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2403 |
* |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2404 |
* @param pos Position to be used for error reporting. |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2405 |
* @param site The class whose methods are checked. |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2406 |
* @param sym The method symbol to be checked. |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2407 |
*/ |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2408 |
void checkHideClashes(DiagnosticPosition pos, Type site, MethodSymbol sym) { |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2409 |
ClashFilter cf = new ClashFilter(site); |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2410 |
//for each method m1 that is a member of 'site'... |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
9604
diff
changeset
|
2411 |
for (Symbol s : types.membersClosure(site, true).getElementsByName(sym.name, cf)) { |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2412 |
//if (i) the signature of 'sym' is not a subsignature of m1 (seen as |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2413 |
//a member of 'site') and (ii) 'sym' has the same erasure as m1, issue an error |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2414 |
if (!types.isSubSignature(sym.type, types.memberType(site, s), allowStrictMethodClashCheck) && |
8427
703181b01773
7017664: Add listeners infrastracture to javac scopes
mcimadamore
parents:
8242
diff
changeset
|
2415 |
types.hasSameArgs(s.erasure(types), sym.erasure(types))) { |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2416 |
log.error(pos, |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2417 |
"name.clash.same.erasure.no.hide", |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2418 |
sym, sym.location(), |
8427
703181b01773
7017664: Add listeners infrastracture to javac scopes
mcimadamore
parents:
8242
diff
changeset
|
2419 |
s, s.location()); |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2420 |
return; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2421 |
} |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2422 |
} |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2423 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2424 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2425 |
//where |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2426 |
private class ClashFilter implements Filter<Symbol> { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2427 |
|
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2428 |
Type site; |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2429 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2430 |
ClashFilter(Type site) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2431 |
this.site = site; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2432 |
} |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2433 |
|
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2434 |
boolean shouldSkip(Symbol s) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2435 |
return (s.flags() & CLASH) != 0 && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2436 |
s.owner == site.tsym; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2437 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2438 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2439 |
public boolean accepts(Symbol s) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2440 |
return s.kind == MTH && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2441 |
(s.flags() & SYNTHETIC) == 0 && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2442 |
!shouldSkip(s) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2443 |
s.isInheritedIn(site.tsym, types) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2444 |
!s.isConstructor(); |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2445 |
} |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2446 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2447 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2448 |
void checkDefaultMethodClashes(DiagnosticPosition pos, Type site) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2449 |
DefaultMethodClashFilter dcf = new DefaultMethodClashFilter(site); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2450 |
for (Symbol m : types.membersClosure(site, false).getElements(dcf)) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2451 |
Assert.check(m.kind == MTH); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2452 |
List<MethodSymbol> prov = types.interfaceCandidates(site, (MethodSymbol)m); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2453 |
if (prov.size() > 1) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2454 |
ListBuffer<Symbol> abstracts = ListBuffer.lb(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2455 |
ListBuffer<Symbol> defaults = ListBuffer.lb(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2456 |
for (MethodSymbol provSym : prov) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2457 |
if ((provSym.flags() & DEFAULT) != 0) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2458 |
defaults = defaults.append(provSym); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2459 |
} else if ((provSym.flags() & ABSTRACT) != 0) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2460 |
abstracts = abstracts.append(provSym); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2461 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2462 |
if (defaults.nonEmpty() && defaults.size() + abstracts.size() >= 2) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2463 |
//strong semantics - issue an error if two sibling interfaces |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2464 |
//have two override-equivalent defaults - or if one is abstract |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2465 |
//and the other is default |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2466 |
String errKey; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2467 |
Symbol s1 = defaults.first(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2468 |
Symbol s2; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2469 |
if (defaults.size() > 1) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2470 |
errKey = "types.incompatible.unrelated.defaults"; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2471 |
s2 = defaults.toList().tail.head; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2472 |
} else { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2473 |
errKey = "types.incompatible.abstract.default"; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2474 |
s2 = abstracts.first(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2475 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2476 |
log.error(pos, errKey, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2477 |
Kinds.kindName(site.tsym), site, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2478 |
m.name, types.memberType(site, m).getParameterTypes(), |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2479 |
s1.location(), s2.location()); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2480 |
break; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2481 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2482 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2483 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2484 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2485 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2486 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2487 |
//where |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2488 |
private class DefaultMethodClashFilter implements Filter<Symbol> { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2489 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2490 |
Type site; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2491 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2492 |
DefaultMethodClashFilter(Type site) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2493 |
this.site = site; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2494 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2495 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2496 |
public boolean accepts(Symbol s) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2497 |
return s.kind == MTH && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2498 |
(s.flags() & DEFAULT) != 0 && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2499 |
s.isInheritedIn(site.tsym, types) && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2500 |
!s.isConstructor(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2501 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2502 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2503 |
|
3557
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2504 |
/** Report a conflict between a user symbol and a synthetic symbol. |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2505 |
*/ |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2506 |
private void syntheticError(DiagnosticPosition pos, Symbol sym) { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2507 |
if (!sym.type.isErroneous()) { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2508 |
if (warnOnSyntheticConflicts) { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2509 |
log.warning(pos, "synthetic.name.conflict", sym, sym.location()); |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2510 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2511 |
else { |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2512 |
log.error(pos, "synthetic.name.conflict", sym, sym.location()); |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2513 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2514 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2515 |
} |
a803afefa115
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents:
3149
diff
changeset
|
2516 |
|
10 | 2517 |
/** Check that class c does not implement directly or indirectly |
2518 |
* the same parameterized interface with two different argument lists. |
|
2519 |
* @param pos Position to be used for error reporting. |
|
2520 |
* @param type The type whose interfaces are checked. |
|
2521 |
*/ |
|
2522 |
void checkClassBounds(DiagnosticPosition pos, Type type) { |
|
2523 |
checkClassBounds(pos, new HashMap<TypeSymbol,Type>(), type); |
|
2524 |
} |
|
2525 |
//where |
|
2526 |
/** Enter all interfaces of type `type' into the hash table `seensofar' |
|
2527 |
* with their class symbol as key and their type as value. Make |
|
2528 |
* sure no class is entered with two different types. |
|
2529 |
*/ |
|
2530 |
void checkClassBounds(DiagnosticPosition pos, |
|
2531 |
Map<TypeSymbol,Type> seensofar, |
|
2532 |
Type type) { |
|
2533 |
if (type.isErroneous()) return; |
|
2534 |
for (List<Type> l = types.interfaces(type); l.nonEmpty(); l = l.tail) { |
|
2535 |
Type it = l.head; |
|
2536 |
Type oldit = seensofar.put(it.tsym, it); |
|
2537 |
if (oldit != null) { |
|
2538 |
List<Type> oldparams = oldit.allparams(); |
|
2539 |
List<Type> newparams = it.allparams(); |
|
2540 |
if (!types.containsTypeEquivalent(oldparams, newparams)) |
|
2541 |
log.error(pos, "cant.inherit.diff.arg", |
|
2542 |
it.tsym, Type.toString(oldparams), |
|
2543 |
Type.toString(newparams)); |
|
2544 |
} |
|
2545 |
checkClassBounds(pos, seensofar, it); |
|
2546 |
} |
|
2547 |
Type st = types.supertype(type); |
|
2548 |
if (st != null) checkClassBounds(pos, seensofar, st); |
|
2549 |
} |
|
2550 |
||
2551 |
/** Enter interface into into set. |
|
2552 |
* If it existed already, issue a "repeated interface" error. |
|
2553 |
*/ |
|
2554 |
void checkNotRepeated(DiagnosticPosition pos, Type it, Set<Type> its) { |
|
2555 |
if (its.contains(it)) |
|
2556 |
log.error(pos, "repeated.interface"); |
|
2557 |
else { |
|
2558 |
its.add(it); |
|
2559 |
} |
|
2560 |
} |
|
2561 |
||
2562 |
/* ************************************************************************* |
|
2563 |
* Check annotations |
|
2564 |
**************************************************************************/ |
|
2565 |
||
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2566 |
/** |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2567 |
* Recursively validate annotations values |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2568 |
*/ |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2569 |
void validateAnnotationTree(JCTree tree) { |
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2570 |
class AnnotationValidator extends TreeScanner { |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2571 |
@Override |
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2572 |
public void visitAnnotation(JCAnnotation tree) { |
9814
978b696e85ad
7042623: Regression: javac silently crash when attributing non-existent annotation
jjg
parents:
9812
diff
changeset
|
2573 |
if (!tree.type.isErroneous()) { |
978b696e85ad
7042623: Regression: javac silently crash when attributing non-existent annotation
jjg
parents:
9812
diff
changeset
|
2574 |
super.visitAnnotation(tree); |
978b696e85ad
7042623: Regression: javac silently crash when attributing non-existent annotation
jjg
parents:
9812
diff
changeset
|
2575 |
validateAnnotation(tree); |
978b696e85ad
7042623: Regression: javac silently crash when attributing non-existent annotation
jjg
parents:
9812
diff
changeset
|
2576 |
} |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2577 |
} |
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2578 |
} |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2579 |
tree.accept(new AnnotationValidator()); |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2580 |
} |
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2581 |
|
13844 | 2582 |
/** |
2583 |
* {@literal |
|
2584 |
* Annotation types are restricted to primitives, String, an |
|
10 | 2585 |
* enum, an annotation, Class, Class<?>, Class<? extends |
2586 |
* Anything>, arrays of the preceding. |
|
13844 | 2587 |
* } |
10 | 2588 |
*/ |
2589 |
void validateAnnotationType(JCTree restype) { |
|
2590 |
// restype may be null if an error occurred, so don't bother validating it |
|
2591 |
if (restype != null) { |
|
2592 |
validateAnnotationType(restype.pos(), restype.type); |
|
2593 |
} |
|
2594 |
} |
|
2595 |
||
2596 |
void validateAnnotationType(DiagnosticPosition pos, Type type) { |
|
2597 |
if (type.isPrimitive()) return; |
|
2598 |
if (types.isSameType(type, syms.stringType)) return; |
|
2599 |
if ((type.tsym.flags() & Flags.ENUM) != 0) return; |
|
2600 |
if ((type.tsym.flags() & Flags.ANNOTATION) != 0) return; |
|
2601 |
if (types.lowerBound(type).tsym == syms.classType.tsym) return; |
|
2602 |
if (types.isArray(type) && !types.isArray(types.elemtype(type))) { |
|
2603 |
validateAnnotationType(pos, types.elemtype(type)); |
|
2604 |
return; |
|
2605 |
} |
|
2606 |
log.error(pos, "invalid.annotation.member.type"); |
|
2607 |
} |
|
2608 |
||
2609 |
/** |
|
2610 |
* "It is also a compile-time error if any method declared in an |
|
2611 |
* annotation type has a signature that is override-equivalent to |
|
2612 |
* that of any public or protected method declared in class Object |
|
2613 |
* or in the interface annotation.Annotation." |
|
2614 |
* |
|
9303
eae35c201e19
7032975: API files in javax.annotation.processing need to be updated for references to JLS
jjh
parents:
9073
diff
changeset
|
2615 |
* @jls 9.6 Annotation Types |
10 | 2616 |
*/ |
2617 |
void validateAnnotationMethod(DiagnosticPosition pos, MethodSymbol m) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2618 |
for (Type sup = syms.annotationType; sup.hasTag(CLASS); sup = types.supertype(sup)) { |
10 | 2619 |
Scope s = sup.tsym.members(); |
2620 |
for (Scope.Entry e = s.lookup(m.name); e.scope != null; e = e.next()) { |
|
2621 |
if (e.sym.kind == MTH && |
|
2622 |
(e.sym.flags() & (PUBLIC | PROTECTED)) != 0 && |
|
2623 |
types.overrideEquivalent(m.type, e.sym.type)) |
|
2624 |
log.error(pos, "intf.annotation.member.clash", e.sym, sup); |
|
2625 |
} |
|
2626 |
} |
|
2627 |
} |
|
2628 |
||
2629 |
/** Check the annotations of a symbol. |
|
2630 |
*/ |
|
2631 |
public void validateAnnotations(List<JCAnnotation> annotations, Symbol s) { |
|
2632 |
for (JCAnnotation a : annotations) |
|
2633 |
validateAnnotation(a, s); |
|
2634 |
} |
|
2635 |
||
15385 | 2636 |
/** Check the type annotations. |
2637 |
*/ |
|
2638 |
public void validateTypeAnnotations(List<JCAnnotation> annotations, boolean isTypeParameter) { |
|
2639 |
for (JCAnnotation a : annotations) |
|
2640 |
validateTypeAnnotation(a, isTypeParameter); |
|
2641 |
} |
|
2642 |
||
10 | 2643 |
/** Check an annotation of a symbol. |
2644 |
*/ |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2645 |
private void validateAnnotation(JCAnnotation a, Symbol s) { |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2646 |
validateAnnotationTree(a); |
10 | 2647 |
|
2648 |
if (!annotationApplicable(a, s)) |
|
2649 |
log.error(a.pos(), "annotation.type.not.applicable"); |
|
2650 |
||
2651 |
if (a.annotationType.type.tsym == syms.overrideType.tsym) { |
|
2652 |
if (!isOverrider(s)) |
|
2653 |
log.error(a.pos(), "method.does.not.override.superclass"); |
|
2654 |
} |
|
15361
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2655 |
|
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2656 |
if (a.annotationType.type.tsym == syms.functionalInterfaceType.tsym) { |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2657 |
if (s.kind != TYP) { |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2658 |
log.error(a.pos(), "bad.functional.intf.anno"); |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2659 |
} else { |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2660 |
try { |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2661 |
types.findDescriptorSymbol((TypeSymbol)s); |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2662 |
} catch (Types.FunctionDescriptorLookupError ex) { |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2663 |
log.error(a.pos(), "bad.functional.intf.anno.1", ex.getDiagnostic()); |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2664 |
} |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2665 |
} |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2666 |
} |
10 | 2667 |
} |
2668 |
||
15385 | 2669 |
public void validateTypeAnnotation(JCAnnotation a, boolean isTypeParameter) { |
2670 |
Assert.checkNonNull(a.type, "annotation tree hasn't been attributed yet: " + a); |
|
2671 |
validateAnnotationTree(a); |
|
2672 |
||
2673 |
if (!isTypeAnnotation(a, isTypeParameter)) |
|
2674 |
log.error(a.pos(), "annotation.type.not.applicable"); |
|
2675 |
} |
|
2676 |
||
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2677 |
/** |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2678 |
* Validate the proposed container 'repeatable' on the |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2679 |
* annotation type symbol 's'. Report errors at position |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2680 |
* 'pos'. |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2681 |
* |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2682 |
* @param s The (annotation)type declaration annotated with a @Repeatable |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2683 |
* @param repeatable the @Repeatable on 's' |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2684 |
* @param pos where to report errors |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2685 |
*/ |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2686 |
public void validateRepeatable(TypeSymbol s, Attribute.Compound repeatable, DiagnosticPosition pos) { |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2687 |
Assert.check(types.isSameType(repeatable.type, syms.repeatableType)); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2688 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2689 |
Type t = null; |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2690 |
List<Pair<MethodSymbol,Attribute>> l = repeatable.values; |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2691 |
if (!l.isEmpty()) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2692 |
Assert.check(l.head.fst.name == names.value); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2693 |
t = ((Attribute.Class)l.head.snd).getValue(); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2694 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2695 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2696 |
if (t == null) { |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2697 |
// errors should already have been reported during Annotate |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2698 |
return; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2699 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2700 |
|
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2701 |
validateValue(t.tsym, s, pos); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2702 |
validateRetention(t.tsym, s, pos); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2703 |
validateDocumented(t.tsym, s, pos); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2704 |
validateInherited(t.tsym, s, pos); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2705 |
validateTarget(t.tsym, s, pos); |
14054
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2706 |
validateDefault(t.tsym, s, pos); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2707 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2708 |
|
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2709 |
private void validateValue(TypeSymbol container, TypeSymbol contained, DiagnosticPosition pos) { |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2710 |
Scope.Entry e = container.members().lookup(names.value); |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2711 |
if (e.scope != null && e.sym.kind == MTH) { |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2712 |
MethodSymbol m = (MethodSymbol) e.sym; |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2713 |
Type ret = m.getReturnType(); |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2714 |
if (!(ret.hasTag(ARRAY) && types.isSameType(((ArrayType)ret).elemtype, contained.type))) { |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2715 |
log.error(pos, "invalid.repeatable.annotation.value.return", |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2716 |
container, ret, types.makeArrayType(contained.type)); |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2717 |
} |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2718 |
} else { |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2719 |
log.error(pos, "invalid.repeatable.annotation.no.value", container); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2720 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2721 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2722 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2723 |
private void validateRetention(Symbol container, Symbol contained, DiagnosticPosition pos) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2724 |
Attribute.RetentionPolicy containerRetention = types.getRetention(container); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2725 |
Attribute.RetentionPolicy containedRetention = types.getRetention(contained); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2726 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2727 |
boolean error = false; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2728 |
switch (containedRetention) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2729 |
case RUNTIME: |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2730 |
if (containerRetention != Attribute.RetentionPolicy.RUNTIME) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2731 |
error = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2732 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2733 |
break; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2734 |
case CLASS: |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2735 |
if (containerRetention == Attribute.RetentionPolicy.SOURCE) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2736 |
error = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2737 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2738 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2739 |
if (error ) { |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2740 |
log.error(pos, "invalid.repeatable.annotation.retention", |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2741 |
container, containerRetention, |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2742 |
contained, containedRetention); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2743 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2744 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2745 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2746 |
private void validateDocumented(Symbol container, Symbol contained, DiagnosticPosition pos) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2747 |
if (contained.attribute(syms.documentedType.tsym) != null) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2748 |
if (container.attribute(syms.documentedType.tsym) == null) { |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2749 |
log.error(pos, "invalid.repeatable.annotation.not.documented", container, contained); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2750 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2751 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2752 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2753 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2754 |
private void validateInherited(Symbol container, Symbol contained, DiagnosticPosition pos) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2755 |
if (contained.attribute(syms.inheritedType.tsym) != null) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2756 |
if (container.attribute(syms.inheritedType.tsym) == null) { |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2757 |
log.error(pos, "invalid.repeatable.annotation.not.inherited", container, contained); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2758 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2759 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2760 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2761 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2762 |
private void validateTarget(Symbol container, Symbol contained, DiagnosticPosition pos) { |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2763 |
// The set of targets the container is applicable to must be a subset |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2764 |
// (with respect to annotation target semantics) of the set of targets |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2765 |
// the contained is applicable to. The target sets may be implicit or |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2766 |
// explicit. |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2767 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2768 |
Set<Name> containerTargets; |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2769 |
Attribute.Array containerTarget = getAttributeTargetAttribute(container); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2770 |
if (containerTarget == null) { |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2771 |
containerTargets = getDefaultTargetSet(); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2772 |
} else { |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2773 |
containerTargets = new HashSet<Name>(); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2774 |
for (Attribute app : containerTarget.values) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2775 |
if (!(app instanceof Attribute.Enum)) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2776 |
continue; // recovery |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2777 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2778 |
Attribute.Enum e = (Attribute.Enum)app; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2779 |
containerTargets.add(e.value.name); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2780 |
} |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2781 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2782 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2783 |
Set<Name> containedTargets; |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2784 |
Attribute.Array containedTarget = getAttributeTargetAttribute(contained); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2785 |
if (containedTarget == null) { |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2786 |
containedTargets = getDefaultTargetSet(); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2787 |
} else { |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2788 |
containedTargets = new HashSet<Name>(); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2789 |
for (Attribute app : containedTarget.values) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2790 |
if (!(app instanceof Attribute.Enum)) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2791 |
continue; // recovery |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2792 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2793 |
Attribute.Enum e = (Attribute.Enum)app; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2794 |
containedTargets.add(e.value.name); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2795 |
} |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2796 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2797 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2798 |
if (!isTargetSubsetOf(containerTargets, containedTargets)) { |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2799 |
log.error(pos, "invalid.repeatable.annotation.incompatible.target", container, contained); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2800 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2801 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2802 |
|
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2803 |
/* get a set of names for the default target */ |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2804 |
private Set<Name> getDefaultTargetSet() { |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2805 |
if (defaultTargets == null) { |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2806 |
Set<Name> targets = new HashSet<Name>(); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2807 |
targets.add(names.ANNOTATION_TYPE); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2808 |
targets.add(names.CONSTRUCTOR); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2809 |
targets.add(names.FIELD); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2810 |
targets.add(names.LOCAL_VARIABLE); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2811 |
targets.add(names.METHOD); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2812 |
targets.add(names.PACKAGE); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2813 |
targets.add(names.PARAMETER); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2814 |
targets.add(names.TYPE); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2815 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2816 |
defaultTargets = java.util.Collections.unmodifiableSet(targets); |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2817 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2818 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2819 |
return defaultTargets; |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2820 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2821 |
private Set<Name> defaultTargets; |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2822 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2823 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2824 |
/** Checks that s is a subset of t, with respect to ElementType |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2825 |
* semantics, specifically {ANNOTATION_TYPE} is a subset of {TYPE} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2826 |
*/ |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2827 |
private boolean isTargetSubsetOf(Set<Name> s, Set<Name> t) { |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2828 |
// Check that all elements in s are present in t |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2829 |
for (Name n2 : s) { |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2830 |
boolean currentElementOk = false; |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2831 |
for (Name n1 : t) { |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2832 |
if (n1 == n2) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2833 |
currentElementOk = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2834 |
break; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2835 |
} else if (n1 == names.TYPE && n2 == names.ANNOTATION_TYPE) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2836 |
currentElementOk = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2837 |
break; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2838 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2839 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2840 |
if (!currentElementOk) |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2841 |
return false; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2842 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2843 |
return true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2844 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2845 |
|
14054
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2846 |
private void validateDefault(Symbol container, Symbol contained, DiagnosticPosition pos) { |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2847 |
// validate that all other elements of containing type has defaults |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2848 |
Scope scope = container.members(); |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2849 |
for(Symbol elm : scope.getElements()) { |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2850 |
if (elm.name != names.value && |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2851 |
elm.kind == Kinds.MTH && |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2852 |
((MethodSymbol)elm).defaultValue == null) { |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2853 |
log.error(pos, |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2854 |
"invalid.repeatable.annotation.elem.nondefault", |
14054
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2855 |
container, |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2856 |
elm); |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2857 |
} |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2858 |
} |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2859 |
} |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
2860 |
|
10 | 2861 |
/** Is s a method symbol that overrides a method in a superclass? */ |
2862 |
boolean isOverrider(Symbol s) { |
|
2863 |
if (s.kind != MTH || s.isStatic()) |
|
2864 |
return false; |
|
2865 |
MethodSymbol m = (MethodSymbol)s; |
|
2866 |
TypeSymbol owner = (TypeSymbol)m.owner; |
|
2867 |
for (Type sup : types.closure(owner.type)) { |
|
2868 |
if (sup == owner.type) |
|
2869 |
continue; // skip "this" |
|
2870 |
Scope scope = sup.tsym.members(); |
|
2871 |
for (Scope.Entry e = scope.lookup(m.name); e.scope != null; e = e.next()) { |
|
2872 |
if (!e.sym.isStatic() && m.overrides(e.sym, owner, types, true)) |
|
2873 |
return true; |
|
2874 |
} |
|
2875 |
} |
|
2876 |
return false; |
|
2877 |
} |
|
2878 |
||
15385 | 2879 |
/** Is the annotation applicable to type annotations? */ |
2880 |
protected boolean isTypeAnnotation(JCAnnotation a, boolean isTypeParameter) { |
|
2881 |
Attribute.Compound atTarget = |
|
2882 |
a.annotationType.type.tsym.attribute(syms.annotationTargetType.tsym); |
|
2883 |
if (atTarget == null) { |
|
2884 |
// An annotation without @Target is not a type annotation. |
|
2885 |
return false; |
|
2886 |
} |
|
2887 |
||
2888 |
Attribute atValue = atTarget.member(names.value); |
|
2889 |
if (!(atValue instanceof Attribute.Array)) { |
|
2890 |
return false; // error recovery |
|
2891 |
} |
|
2892 |
||
2893 |
Attribute.Array arr = (Attribute.Array) atValue; |
|
2894 |
for (Attribute app : arr.values) { |
|
2895 |
if (!(app instanceof Attribute.Enum)) { |
|
2896 |
return false; // recovery |
|
2897 |
} |
|
2898 |
Attribute.Enum e = (Attribute.Enum) app; |
|
2899 |
||
2900 |
if (e.value.name == names.TYPE_USE) |
|
2901 |
return true; |
|
2902 |
else if (isTypeParameter && e.value.name == names.TYPE_PARAMETER) |
|
2903 |
return true; |
|
2904 |
} |
|
2905 |
return false; |
|
2906 |
} |
|
2907 |
||
10 | 2908 |
/** Is the annotation applicable to the symbol? */ |
2909 |
boolean annotationApplicable(JCAnnotation a, Symbol s) { |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2910 |
Attribute.Array arr = getAttributeTargetAttribute(a.annotationType.type.tsym); |
15385 | 2911 |
Name[] targets; |
2912 |
||
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2913 |
if (arr == null) { |
15385 | 2914 |
targets = defaultTargetMetaInfo(a, s); |
2915 |
} else { |
|
2916 |
// TODO: can we optimize this? |
|
2917 |
targets = new Name[arr.values.length]; |
|
2918 |
for (int i=0; i<arr.values.length; ++i) { |
|
2919 |
Attribute app = arr.values[i]; |
|
2920 |
if (!(app instanceof Attribute.Enum)) { |
|
2921 |
return true; // recovery |
|
2922 |
} |
|
2923 |
Attribute.Enum e = (Attribute.Enum) app; |
|
2924 |
targets[i] = e.value.name; |
|
2925 |
} |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2926 |
} |
15385 | 2927 |
for (Name target : targets) { |
2928 |
if (target == names.TYPE) |
|
10 | 2929 |
{ if (s.kind == TYP) return true; } |
15385 | 2930 |
else if (target == names.FIELD) |
10 | 2931 |
{ if (s.kind == VAR && s.owner.kind != MTH) return true; } |
15385 | 2932 |
else if (target == names.METHOD) |
10 | 2933 |
{ if (s.kind == MTH && !s.isConstructor()) return true; } |
15385 | 2934 |
else if (target == names.PARAMETER) |
10 | 2935 |
{ if (s.kind == VAR && |
2936 |
s.owner.kind == MTH && |
|
2937 |
(s.flags() & PARAMETER) != 0) |
|
2938 |
return true; |
|
2939 |
} |
|
15385 | 2940 |
else if (target == names.CONSTRUCTOR) |
10 | 2941 |
{ if (s.kind == MTH && s.isConstructor()) return true; } |
15385 | 2942 |
else if (target == names.LOCAL_VARIABLE) |
10 | 2943 |
{ if (s.kind == VAR && s.owner.kind == MTH && |
2944 |
(s.flags() & PARAMETER) == 0) |
|
2945 |
return true; |
|
2946 |
} |
|
15385 | 2947 |
else if (target == names.ANNOTATION_TYPE) |
10 | 2948 |
{ if (s.kind == TYP && (s.flags() & ANNOTATION) != 0) |
2949 |
return true; |
|
2950 |
} |
|
15385 | 2951 |
else if (target == names.PACKAGE) |
10 | 2952 |
{ if (s.kind == PCK) return true; } |
15385 | 2953 |
else if (target == names.TYPE_USE) |
3149 | 2954 |
{ if (s.kind == TYP || |
2955 |
s.kind == VAR || |
|
2956 |
(s.kind == MTH && !s.isConstructor() && |
|
15385 | 2957 |
!s.type.getReturnType().hasTag(VOID)) || |
2958 |
(s.kind == MTH && s.isConstructor())) |
|
2959 |
return true; |
|
2960 |
} |
|
2961 |
else if (target == names.TYPE_PARAMETER) |
|
2962 |
{ if (s.kind == TYP && s.type.hasTag(TYPEVAR)) |
|
3149 | 2963 |
return true; |
2964 |
} |
|
10 | 2965 |
else |
2966 |
return true; // recovery |
|
2967 |
} |
|
2968 |
return false; |
|
2969 |
} |
|
2970 |
||
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2971 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2972 |
Attribute.Array getAttributeTargetAttribute(Symbol s) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2973 |
Attribute.Compound atTarget = |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2974 |
s.attribute(syms.annotationTargetType.tsym); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2975 |
if (atTarget == null) return null; // ok, is applicable |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2976 |
Attribute atValue = atTarget.member(names.value); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2977 |
if (!(atValue instanceof Attribute.Array)) return null; // error recovery |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2978 |
return (Attribute.Array) atValue; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2979 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2980 |
|
15385 | 2981 |
private final Name[] dfltTargetMeta; |
2982 |
private Name[] defaultTargetMetaInfo(JCAnnotation a, Symbol s) { |
|
2983 |
return dfltTargetMeta; |
|
2984 |
} |
|
2985 |
||
10 | 2986 |
/** Check an annotation value. |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2987 |
* |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2988 |
* @param a The annotation tree to check |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2989 |
* @return true if this annotation tree is valid, otherwise false |
10 | 2990 |
*/ |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2991 |
public boolean validateAnnotationDeferErrors(JCAnnotation a) { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2992 |
boolean res = false; |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2993 |
final Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log); |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2994 |
try { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2995 |
res = validateAnnotation(a); |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2996 |
} finally { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2997 |
log.popDiagnosticHandler(diagHandler); |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2998 |
} |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
2999 |
return res; |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3000 |
} |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3001 |
|
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3002 |
private boolean validateAnnotation(JCAnnotation a) { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3003 |
boolean isValid = true; |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3004 |
// collect an inventory of the annotation elements |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3005 |
Set<MethodSymbol> members = new LinkedHashSet<MethodSymbol>(); |
10 | 3006 |
for (Scope.Entry e = a.annotationType.type.tsym.members().elems; |
17552
241d13ccb08b
8013485: javac can't handle annotations with a <clinit> from a previous compilation unit
jfranck
parents:
17281
diff
changeset
|
3007 |
e != null; |
241d13ccb08b
8013485: javac can't handle annotations with a <clinit> from a previous compilation unit
jfranck
parents:
17281
diff
changeset
|
3008 |
e = e.sibling) |
241d13ccb08b
8013485: javac can't handle annotations with a <clinit> from a previous compilation unit
jfranck
parents:
17281
diff
changeset
|
3009 |
if (e.sym.kind == MTH && e.sym.name != names.clinit) |
10 | 3010 |
members.add((MethodSymbol) e.sym); |
3011 |
||
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3012 |
// remove the ones that are assigned values |
10 | 3013 |
for (JCTree arg : a.args) { |
10950 | 3014 |
if (!arg.hasTag(ASSIGN)) continue; // recovery |
10 | 3015 |
JCAssign assign = (JCAssign) arg; |
3016 |
Symbol m = TreeInfo.symbol(assign.lhs); |
|
3017 |
if (m == null || m.type.isErroneous()) continue; |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3018 |
if (!members.remove(m)) { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3019 |
isValid = false; |
4867
7f4efc9b2f9f
6919944: incorrect position given for duplicate annotation value error
jjg
parents:
3780
diff
changeset
|
3020 |
log.error(assign.lhs.pos(), "duplicate.annotation.member.value", |
10 | 3021 |
m.name, a.type); |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3022 |
} |
10 | 3023 |
} |
3024 |
||
3025 |
// all the remaining ones better have default values |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3026 |
List<Name> missingDefaults = List.nil(); |
6345
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3027 |
for (MethodSymbol m : members) { |
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3028 |
if (m.defaultValue == null && !m.type.isErroneous()) { |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3029 |
missingDefaults = missingDefaults.append(m.name); |
6345
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3030 |
} |
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3031 |
} |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3032 |
missingDefaults = missingDefaults.reverse(); |
6345
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3033 |
if (missingDefaults.nonEmpty()) { |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3034 |
isValid = false; |
6345
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3035 |
String key = (missingDefaults.size() > 1) |
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3036 |
? "annotation.missing.default.value.1" |
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3037 |
: "annotation.missing.default.value"; |
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3038 |
log.error(a.pos(), key, a.type, missingDefaults); |
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3039 |
} |
10 | 3040 |
|
3041 |
// special case: java.lang.annotation.Target must not have |
|
3042 |
// repeated values in its value member |
|
3043 |
if (a.annotationType.type.tsym != syms.annotationTargetType.tsym || |
|
3044 |
a.args.tail == null) |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3045 |
return isValid; |
10 | 3046 |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3047 |
if (!a.args.head.hasTag(ASSIGN)) return false; // error recovery |
10 | 3048 |
JCAssign assign = (JCAssign) a.args.head; |
3049 |
Symbol m = TreeInfo.symbol(assign.lhs); |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3050 |
if (m.name != names.value) return false; |
10 | 3051 |
JCTree rhs = assign.rhs; |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3052 |
if (!rhs.hasTag(NEWARRAY)) return false; |
10 | 3053 |
JCNewArray na = (JCNewArray) rhs; |
3054 |
Set<Symbol> targets = new HashSet<Symbol>(); |
|
3055 |
for (JCTree elem : na.elems) { |
|
3056 |
if (!targets.add(TreeInfo.symbol(elem))) { |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3057 |
isValid = false; |
10 | 3058 |
log.error(elem.pos(), "repeated.annotation.target"); |
3059 |
} |
|
3060 |
} |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3061 |
return isValid; |
10 | 3062 |
} |
3063 |
||
3064 |
void checkDeprecatedAnnotation(DiagnosticPosition pos, Symbol s) { |
|
3065 |
if (allowAnnotations && |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3066 |
lint.isEnabled(LintCategory.DEP_ANN) && |
10 | 3067 |
(s.flags() & DEPRECATED) != 0 && |
3068 |
!syms.deprecatedType.isErroneous() && |
|
3069 |
s.attribute(syms.deprecatedType.tsym) == null) { |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3070 |
log.warning(LintCategory.DEP_ANN, |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
3071 |
pos, "missing.deprecated.annotation"); |
10 | 3072 |
} |
3073 |
} |
|
3074 |
||
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3075 |
void checkDeprecated(final DiagnosticPosition pos, final Symbol other, final Symbol s) { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3076 |
if ((s.flags() & DEPRECATED) != 0 && |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3077 |
(other.flags() & DEPRECATED) == 0 && |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3078 |
s.outermostClass() != other.outermostClass()) { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3079 |
deferredLintHandler.report(new DeferredLintHandler.LintLogger() { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3080 |
@Override |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3081 |
public void report() { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3082 |
warnDeprecated(pos, s); |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3083 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3084 |
}); |
11314 | 3085 |
} |
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3086 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3087 |
|
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3088 |
void checkSunAPI(final DiagnosticPosition pos, final Symbol s) { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3089 |
if ((s.flags() & PROPRIETARY) != 0) { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3090 |
deferredLintHandler.report(new DeferredLintHandler.LintLogger() { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3091 |
public void report() { |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3092 |
if (enableSunApiLintControl) |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3093 |
warnSunApi(pos, "sun.proprietary", s); |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3094 |
else |
12079
e1739a771470
7148622: Some diagnostic methods do not go through Log.report
mcimadamore
parents:
12077
diff
changeset
|
3095 |
log.mandatoryWarning(pos, "sun.proprietary", s); |
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3096 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3097 |
}); |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3098 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3099 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3100 |
|
15724 | 3101 |
void checkProfile(final DiagnosticPosition pos, final Symbol s) { |
3102 |
if (profile != Profile.DEFAULT && (s.flags() & NOT_IN_PROFILE) != 0) { |
|
3103 |
log.error(pos, "not.in.profile", s, profile); |
|
3104 |
} |
|
3105 |
} |
|
3106 |
||
10 | 3107 |
/* ************************************************************************* |
3108 |
* Check for recursive annotation elements. |
|
3109 |
**************************************************************************/ |
|
3110 |
||
3111 |
/** Check for cycles in the graph of annotation elements. |
|
3112 |
*/ |
|
3113 |
void checkNonCyclicElements(JCClassDecl tree) { |
|
3114 |
if ((tree.sym.flags_field & ANNOTATION) == 0) return; |
|
8032 | 3115 |
Assert.check((tree.sym.flags_field & LOCKED) == 0); |
10 | 3116 |
try { |
3117 |
tree.sym.flags_field |= LOCKED; |
|
3118 |
for (JCTree def : tree.defs) { |
|
10950 | 3119 |
if (!def.hasTag(METHODDEF)) continue; |
10 | 3120 |
JCMethodDecl meth = (JCMethodDecl)def; |
3121 |
checkAnnotationResType(meth.pos(), meth.restype.type); |
|
3122 |
} |
|
3123 |
} finally { |
|
3124 |
tree.sym.flags_field &= ~LOCKED; |
|
3125 |
tree.sym.flags_field |= ACYCLIC_ANN; |
|
3126 |
} |
|
3127 |
} |
|
3128 |
||
3129 |
void checkNonCyclicElementsInternal(DiagnosticPosition pos, TypeSymbol tsym) { |
|
3130 |
if ((tsym.flags_field & ACYCLIC_ANN) != 0) |
|
3131 |
return; |
|
3132 |
if ((tsym.flags_field & LOCKED) != 0) { |
|
3133 |
log.error(pos, "cyclic.annotation.element"); |
|
3134 |
return; |
|
3135 |
} |
|
3136 |
try { |
|
3137 |
tsym.flags_field |= LOCKED; |
|
3138 |
for (Scope.Entry e = tsym.members().elems; e != null; e = e.sibling) { |
|
3139 |
Symbol s = e.sym; |
|
3140 |
if (s.kind != Kinds.MTH) |
|
3141 |
continue; |
|
3142 |
checkAnnotationResType(pos, ((MethodSymbol)s).type.getReturnType()); |
|
3143 |
} |
|
3144 |
} finally { |
|
3145 |
tsym.flags_field &= ~LOCKED; |
|
3146 |
tsym.flags_field |= ACYCLIC_ANN; |
|
3147 |
} |
|
3148 |
} |
|
3149 |
||
3150 |
void checkAnnotationResType(DiagnosticPosition pos, Type type) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3151 |
switch (type.getTag()) { |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3152 |
case CLASS: |
10 | 3153 |
if ((type.tsym.flags() & ANNOTATION) != 0) |
3154 |
checkNonCyclicElementsInternal(pos, type.tsym); |
|
3155 |
break; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3156 |
case ARRAY: |
10 | 3157 |
checkAnnotationResType(pos, types.elemtype(type)); |
3158 |
break; |
|
3159 |
default: |
|
3160 |
break; // int etc |
|
3161 |
} |
|
3162 |
} |
|
3163 |
||
3164 |
/* ************************************************************************* |
|
3165 |
* Check for cycles in the constructor call graph. |
|
3166 |
**************************************************************************/ |
|
3167 |
||
3168 |
/** Check for cycles in the graph of constructors calling other |
|
3169 |
* constructors. |
|
3170 |
*/ |
|
3171 |
void checkCyclicConstructors(JCClassDecl tree) { |
|
3172 |
Map<Symbol,Symbol> callMap = new HashMap<Symbol, Symbol>(); |
|
3173 |
||
3174 |
// enter each constructor this-call into the map |
|
3175 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
|
3176 |
JCMethodInvocation app = TreeInfo.firstConstructorCall(l.head); |
|
3177 |
if (app == null) continue; |
|
3178 |
JCMethodDecl meth = (JCMethodDecl) l.head; |
|
3179 |
if (TreeInfo.name(app.meth) == names._this) { |
|
3180 |
callMap.put(meth.sym, TreeInfo.symbol(app.meth)); |
|
3181 |
} else { |
|
3182 |
meth.sym.flags_field |= ACYCLIC; |
|
3183 |
} |
|
3184 |
} |
|
3185 |
||
3186 |
// Check for cycles in the map |
|
3187 |
Symbol[] ctors = new Symbol[0]; |
|
3188 |
ctors = callMap.keySet().toArray(ctors); |
|
3189 |
for (Symbol caller : ctors) { |
|
3190 |
checkCyclicConstructor(tree, caller, callMap); |
|
3191 |
} |
|
3192 |
} |
|
3193 |
||
3194 |
/** Look in the map to see if the given constructor is part of a |
|
3195 |
* call cycle. |
|
3196 |
*/ |
|
3197 |
private void checkCyclicConstructor(JCClassDecl tree, Symbol ctor, |
|
3198 |
Map<Symbol,Symbol> callMap) { |
|
3199 |
if (ctor != null && (ctor.flags_field & ACYCLIC) == 0) { |
|
3200 |
if ((ctor.flags_field & LOCKED) != 0) { |
|
3201 |
log.error(TreeInfo.diagnosticPositionFor(ctor, tree), |
|
3202 |
"recursive.ctor.invocation"); |
|
3203 |
} else { |
|
3204 |
ctor.flags_field |= LOCKED; |
|
3205 |
checkCyclicConstructor(tree, callMap.remove(ctor), callMap); |
|
3206 |
ctor.flags_field &= ~LOCKED; |
|
3207 |
} |
|
3208 |
ctor.flags_field |= ACYCLIC; |
|
3209 |
} |
|
3210 |
} |
|
3211 |
||
3212 |
/* ************************************************************************* |
|
3213 |
* Miscellaneous |
|
3214 |
**************************************************************************/ |
|
3215 |
||
3216 |
/** |
|
3217 |
* Return the opcode of the operator but emit an error if it is an |
|
3218 |
* error. |
|
3219 |
* @param pos position for error reporting. |
|
3220 |
* @param operator an operator |
|
3221 |
* @param tag a tree tag |
|
3222 |
* @param left type of left hand side |
|
3223 |
* @param right type of right hand side |
|
3224 |
*/ |
|
3225 |
int checkOperator(DiagnosticPosition pos, |
|
3226 |
OperatorSymbol operator, |
|
10950 | 3227 |
JCTree.Tag tag, |
10 | 3228 |
Type left, |
3229 |
Type right) { |
|
3230 |
if (operator.opcode == ByteCodes.error) { |
|
3231 |
log.error(pos, |
|
8237
d5ef8db7ad09
5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents:
8236
diff
changeset
|
3232 |
"operator.cant.be.applied.1", |
10 | 3233 |
treeinfo.operatorName(tag), |
8237
d5ef8db7ad09
5017953: spurious cascaded diagnostics when name not found
mcimadamore
parents:
8236
diff
changeset
|
3234 |
left, right); |
10 | 3235 |
} |
3236 |
return operator.opcode; |
|
3237 |
} |
|
3238 |
||
3239 |
||
3240 |
/** |
|
3241 |
* Check for division by integer constant zero |
|
3242 |
* @param pos Position for error reporting. |
|
3243 |
* @param operator The operator for the expression |
|
3244 |
* @param operand The right hand operand for the expression |
|
3245 |
*/ |
|
3246 |
void checkDivZero(DiagnosticPosition pos, Symbol operator, Type operand) { |
|
3247 |
if (operand.constValue() != null |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3248 |
&& lint.isEnabled(LintCategory.DIVZERO) |
18395
d56a5fbf0b32
8016267: javac, TypeTag refactoring has provoked performance issues
vromero
parents:
18393
diff
changeset
|
3249 |
&& operand.getTag().isSubRangeOf(LONG) |
10 | 3250 |
&& ((Number) (operand.constValue())).longValue() == 0) { |
3251 |
int opc = ((OperatorSymbol)operator).opcode; |
|
3252 |
if (opc == ByteCodes.idiv || opc == ByteCodes.imod |
|
3253 |
|| opc == ByteCodes.ldiv || opc == ByteCodes.lmod) { |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3254 |
log.warning(LintCategory.DIVZERO, pos, "div.zero"); |
10 | 3255 |
} |
3256 |
} |
|
3257 |
} |
|
3258 |
||
3259 |
/** |
|
3260 |
* Check for empty statements after if |
|
3261 |
*/ |
|
3262 |
void checkEmptyIf(JCIf tree) { |
|
10950 | 3263 |
if (tree.thenpart.hasTag(SKIP) && tree.elsepart == null && |
3264 |
lint.isEnabled(LintCategory.EMPTY)) |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3265 |
log.warning(LintCategory.EMPTY, tree.thenpart.pos(), "empty.if"); |
10 | 3266 |
} |
3267 |
||
3268 |
/** Check that symbol is unique in given scope. |
|
3269 |
* @param pos Position for error reporting. |
|
3270 |
* @param sym The symbol. |
|
3271 |
* @param s The scope. |
|
3272 |
*/ |
|
3273 |
boolean checkUnique(DiagnosticPosition pos, Symbol sym, Scope s) { |
|
3274 |
if (sym.type.isErroneous()) |
|
3275 |
return true; |
|
3276 |
if (sym.owner.name == names.any) return false; |
|
3277 |
for (Scope.Entry e = s.lookup(sym.name); e.scope == s; e = e.next()) { |
|
3278 |
if (sym != e.sym && |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3279 |
(e.sym.flags() & CLASH) == 0 && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3280 |
sym.kind == e.sym.kind && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3281 |
sym.name != names.error && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3282 |
(sym.kind != MTH || types.hasSameArgs(types.erasure(sym.type), types.erasure(e.sym.type)))) { |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3283 |
if ((sym.flags() & VARARGS) != (e.sym.flags() & VARARGS)) { |
10 | 3284 |
varargsDuplicateError(pos, sym, e.sym); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3285 |
return true; |
8628
9e31f1c01bd4
7022054: Invalid compiler error on covariant overriding methods with the same erasure
mcimadamore
parents:
8610
diff
changeset
|
3286 |
} else if (sym.kind == MTH && !types.hasSameArgs(sym.type, e.sym.type, false)) { |
2509
c8a1744c87fd
6182950: methods clash algorithm should not depend on return type
mcimadamore
parents:
2223
diff
changeset
|
3287 |
duplicateErasureError(pos, sym, e.sym); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3288 |
sym.flags_field |= CLASH; |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3289 |
return true; |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3290 |
} else { |
10 | 3291 |
duplicateError(pos, e.sym); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3292 |
return false; |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3293 |
} |
10 | 3294 |
} |
3295 |
} |
|
3296 |
return true; |
|
3297 |
} |
|
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3298 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3299 |
/** Report duplicate declaration error. |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3300 |
*/ |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3301 |
void duplicateErasureError(DiagnosticPosition pos, Symbol sym1, Symbol sym2) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3302 |
if (!sym1.type.isErroneous() && !sym2.type.isErroneous()) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3303 |
log.error(pos, "name.clash.same.erasure", sym1, sym2); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3304 |
} |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3305 |
} |
10 | 3306 |
|
3307 |
/** Check that single-type import is not already imported or top-level defined, |
|
3308 |
* but make an exception for two single-type imports which denote the same type. |
|
3309 |
* @param pos Position for error reporting. |
|
3310 |
* @param sym The symbol. |
|
3311 |
* @param s The scope |
|
3312 |
*/ |
|
3313 |
boolean checkUniqueImport(DiagnosticPosition pos, Symbol sym, Scope s) { |
|
3314 |
return checkUniqueImport(pos, sym, s, false); |
|
3315 |
} |
|
3316 |
||
3317 |
/** Check that static single-type import is not already imported or top-level defined, |
|
3318 |
* but make an exception for two single-type imports which denote the same type. |
|
3319 |
* @param pos Position for error reporting. |
|
3320 |
* @param sym The symbol. |
|
3321 |
* @param s The scope |
|
3322 |
*/ |
|
3323 |
boolean checkUniqueStaticImport(DiagnosticPosition pos, Symbol sym, Scope s) { |
|
3324 |
return checkUniqueImport(pos, sym, s, true); |
|
3325 |
} |
|
3326 |
||
3327 |
/** Check that single-type import is not already imported or top-level defined, |
|
3328 |
* but make an exception for two single-type imports which denote the same type. |
|
3329 |
* @param pos Position for error reporting. |
|
3330 |
* @param sym The symbol. |
|
3331 |
* @param s The scope. |
|
3332 |
* @param staticImport Whether or not this was a static import |
|
3333 |
*/ |
|
3334 |
private boolean checkUniqueImport(DiagnosticPosition pos, Symbol sym, Scope s, boolean staticImport) { |
|
3335 |
for (Scope.Entry e = s.lookup(sym.name); e.scope != null; e = e.next()) { |
|
3336 |
// is encountered class entered via a class declaration? |
|
3337 |
boolean isClassDecl = e.scope == s; |
|
3338 |
if ((isClassDecl || sym != e.sym) && |
|
3339 |
sym.kind == e.sym.kind && |
|
3340 |
sym.name != names.error) { |
|
3341 |
if (!e.sym.type.isErroneous()) { |
|
3342 |
String what = e.sym.toString(); |
|
3343 |
if (!isClassDecl) { |
|
3344 |
if (staticImport) |
|
3345 |
log.error(pos, "already.defined.static.single.import", what); |
|
3346 |
else |
|
3347 |
log.error(pos, "already.defined.single.import", what); |
|
3348 |
} |
|
3349 |
else if (sym != e.sym) |
|
3350 |
log.error(pos, "already.defined.this.unit", what); |
|
3351 |
} |
|
3352 |
return false; |
|
3353 |
} |
|
3354 |
} |
|
3355 |
return true; |
|
3356 |
} |
|
3357 |
||
3358 |
/** Check that a qualified name is in canonical form (for import decls). |
|
3359 |
*/ |
|
3360 |
public void checkCanonical(JCTree tree) { |
|
3361 |
if (!isCanonical(tree)) |
|
3362 |
log.error(tree.pos(), "import.requires.canonical", |
|
3363 |
TreeInfo.symbol(tree)); |
|
3364 |
} |
|
3365 |
// where |
|
3366 |
private boolean isCanonical(JCTree tree) { |
|
10950 | 3367 |
while (tree.hasTag(SELECT)) { |
10 | 3368 |
JCFieldAccess s = (JCFieldAccess) tree; |
3369 |
if (s.sym.owner != TreeInfo.symbol(s.selected)) |
|
3370 |
return false; |
|
3371 |
tree = s.selected; |
|
3372 |
} |
|
3373 |
return true; |
|
3374 |
} |
|
3375 |
||
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3376 |
/** Check that an auxiliary class is not accessed from any other file than its own. |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3377 |
*/ |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3378 |
void checkForBadAuxiliaryClassAccess(DiagnosticPosition pos, Env<AttrContext> env, ClassSymbol c) { |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3379 |
if (lint.isEnabled(Lint.LintCategory.AUXILIARYCLASS) && |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3380 |
(c.flags() & AUXILIARY) != 0 && |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3381 |
rs.isAccessible(env, c) && |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3382 |
!fileManager.isSameFile(c.sourcefile, env.toplevel.sourcefile)) |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3383 |
{ |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3384 |
log.warning(pos, "auxiliary.class.accessed.from.outside.of.its.source.file", |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3385 |
c, c.sourcefile); |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3386 |
} |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3387 |
} |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3388 |
|
10 | 3389 |
private class ConversionWarner extends Warner { |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3390 |
final String uncheckedKey; |
10 | 3391 |
final Type found; |
3392 |
final Type expected; |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3393 |
public ConversionWarner(DiagnosticPosition pos, String uncheckedKey, Type found, Type expected) { |
10 | 3394 |
super(pos); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3395 |
this.uncheckedKey = uncheckedKey; |
10 | 3396 |
this.found = found; |
3397 |
this.expected = expected; |
|
3398 |
} |
|
3399 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
3400 |
@Override |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3401 |
public void warn(LintCategory lint) { |
10 | 3402 |
boolean warned = this.warned; |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3403 |
super.warn(lint); |
10 | 3404 |
if (warned) return; // suppress redundant diagnostics |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3405 |
switch (lint) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3406 |
case UNCHECKED: |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3407 |
Check.this.warnUnchecked(pos(), "prob.found.req", diags.fragment(uncheckedKey), found, expected); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3408 |
break; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3409 |
case VARARGS: |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3410 |
if (method != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3411 |
method.attribute(syms.trustMeType.tsym) != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3412 |
isTrustMeAllowedOnMethod(method) && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3413 |
!types.isReifiable(method.type.getParameterTypes().last())) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3414 |
Check.this.warnUnsafeVararg(pos(), "varargs.unsafe.use.varargs.param", method.params.last()); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3415 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3416 |
break; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3417 |
default: |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3418 |
throw new AssertionError("Unexpected lint: " + lint); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3419 |
} |
10 | 3420 |
} |
3421 |
} |
|
3422 |
||
3423 |
public Warner castWarner(DiagnosticPosition pos, Type found, Type expected) { |
|
3424 |
return new ConversionWarner(pos, "unchecked.cast.to.type", found, expected); |
|
3425 |
} |
|
3426 |
||
3427 |
public Warner convertWarner(DiagnosticPosition pos, Type found, Type expected) { |
|
3428 |
return new ConversionWarner(pos, "unchecked.assign", found, expected); |
|
3429 |
} |
|
3430 |
} |