author | chegar |
Thu, 17 Oct 2019 20:54:25 +0100 | |
branch | datagramsocketimpl-branch |
changeset 58679 | 9c3209ff7550 |
parent 58678 | 9cf78a70fa4f |
parent 55622 | 0b470386f5f7 |
permissions | -rw-r--r-- |
10 | 1 |
/* |
53390
46db9786cd67
8214345: infinite recursion while checking super class
bsrbnd
parents:
53037
diff
changeset
|
2 |
* Copyright (c) 1999, 2019, 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.*; |
|
53037
e84983c2735e
8215368: Make Check.checkOverride call diagnosticPositionFor lazily
cushon
parents:
52777
diff
changeset
|
29 |
import java.util.function.Supplier; |
15385 | 30 |
|
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
31 |
import javax.tools.JavaFileManager; |
10 | 32 |
|
33 |
import com.sun.tools.javac.code.*; |
|
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
34 |
import com.sun.tools.javac.code.Attribute.Compound; |
41444
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
35 |
import com.sun.tools.javac.code.Directive.ExportsDirective; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
36 |
import com.sun.tools.javac.code.Directive.RequiresDirective; |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
37 |
import com.sun.tools.javac.code.Source.Feature; |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
38 |
import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata; |
10 | 39 |
import com.sun.tools.javac.jvm.*; |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
40 |
import com.sun.tools.javac.resources.CompilerProperties.Errors; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
41 |
import com.sun.tools.javac.resources.CompilerProperties.Fragments; |
41444
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
42 |
import com.sun.tools.javac.resources.CompilerProperties.Warnings; |
10 | 43 |
import com.sun.tools.javac.tree.*; |
44 |
import com.sun.tools.javac.util.*; |
|
31299
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
45 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag; |
10 | 46 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
47 |
import com.sun.tools.javac.util.JCDiagnostic.Error; |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
48 |
import com.sun.tools.javac.util.JCDiagnostic.Fragment; |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
49 |
import com.sun.tools.javac.util.JCDiagnostic.Warning; |
10 | 50 |
import com.sun.tools.javac.util.List; |
51 |
||
52 |
import com.sun.tools.javac.code.Lint; |
|
53 |
import com.sun.tools.javac.code.Lint.LintCategory; |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
54 |
import com.sun.tools.javac.code.Scope.WriteableScope; |
10 | 55 |
import com.sun.tools.javac.code.Type.*; |
56 |
import com.sun.tools.javac.code.Symbol.*; |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
57 |
import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext; |
15705 | 58 |
import com.sun.tools.javac.comp.Infer.FreeTypeListener; |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15361
diff
changeset
|
59 |
import com.sun.tools.javac.tree.JCTree.*; |
10 | 60 |
|
61 |
import static com.sun.tools.javac.code.Flags.*; |
|
10950 | 62 |
import static com.sun.tools.javac.code.Flags.ANNOTATION; |
63 |
import static com.sun.tools.javac.code.Flags.SYNCHRONIZED; |
|
10 | 64 |
import static com.sun.tools.javac.code.Kinds.*; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
25874
diff
changeset
|
65 |
import static com.sun.tools.javac.code.Kinds.Kind.*; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
66 |
import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
67 |
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
|
68 |
import static com.sun.tools.javac.code.TypeTag.WILDCARD; |
10 | 69 |
|
10950 | 70 |
import static com.sun.tools.javac.tree.JCTree.Tag.*; |
6721 | 71 |
|
10 | 72 |
/** Type checking helper class for the attribution phase. |
73 |
* |
|
5847
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5846
diff
changeset
|
74 |
* <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
|
75 |
* If you write code that depends on this, you do so at your own risk. |
10 | 76 |
* This code and its internal interfaces are subject to change or |
77 |
* deletion without notice.</b> |
|
78 |
*/ |
|
79 |
public class Check { |
|
22163 | 80 |
protected static final Context.Key<Check> checkKey = new Context.Key<>(); |
10 | 81 |
|
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
82 |
private final Names names; |
10 | 83 |
private final Log log; |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
84 |
private final Resolve rs; |
10 | 85 |
private final Symtab syms; |
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
86 |
private final Enter enter; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
87 |
private final DeferredAttr deferredAttr; |
10 | 88 |
private final Infer infer; |
89 |
private final Types types; |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
90 |
private final TypeAnnotations typeAnnotations; |
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
91 |
private final JCDiagnostic.Factory diags; |
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
92 |
private final JavaFileManager fileManager; |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
93 |
private final Source source; |
50250
04f9bb270ab8
8203488: Remove error generation from TransTypes
mcimadamore
parents:
50213
diff
changeset
|
94 |
private final Target target; |
15724 | 95 |
private final Profile profile; |
41629 | 96 |
private final boolean warnOnAnyAccessToMembers; |
10 | 97 |
|
98 |
// The set of lint options currently in effect. It is initialized |
|
99 |
// from the context, and then is set/reset as needed by Attr as it |
|
100 |
// visits all the various parts of the trees during attribution. |
|
101 |
private Lint lint; |
|
102 |
||
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
103 |
// 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
|
104 |
// Attr as it visits new method declarations. |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
105 |
private MethodSymbol method; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
106 |
|
10 | 107 |
public static Check instance(Context context) { |
108 |
Check instance = context.get(checkKey); |
|
109 |
if (instance == null) |
|
110 |
instance = new Check(context); |
|
111 |
return instance; |
|
112 |
} |
|
113 |
||
114 |
protected Check(Context context) { |
|
115 |
context.put(checkKey, this); |
|
116 |
||
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
117 |
names = Names.instance(context); |
15385 | 118 |
dfltTargetMeta = new Name[] { names.PACKAGE, names.TYPE, |
119 |
names.FIELD, names.METHOD, names.CONSTRUCTOR, |
|
120 |
names.ANNOTATION_TYPE, names.LOCAL_VARIABLE, names.PARAMETER}; |
|
10 | 121 |
log = Log.instance(context); |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
122 |
rs = Resolve.instance(context); |
10 | 123 |
syms = Symtab.instance(context); |
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
124 |
enter = Enter.instance(context); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
125 |
deferredAttr = DeferredAttr.instance(context); |
10 | 126 |
infer = Infer.instance(context); |
15724 | 127 |
types = Types.instance(context); |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
128 |
typeAnnotations = TypeAnnotations.instance(context); |
1040
c0f5acfd9d15
6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents:
939
diff
changeset
|
129 |
diags = JCDiagnostic.Factory.instance(context); |
10 | 130 |
Options options = Options.instance(context); |
131 |
lint = Lint.instance(context); |
|
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
132 |
fileManager = context.get(JavaFileManager.class); |
10 | 133 |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
134 |
source = Source.instance(context); |
50250
04f9bb270ab8
8203488: Remove error generation from TransTypes
mcimadamore
parents:
50213
diff
changeset
|
135 |
target = Target.instance(context); |
41629 | 136 |
warnOnAnyAccessToMembers = options.isSet("warnOnAccessToMembers"); |
10 | 137 |
|
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
138 |
Target target = Target.instance(context); |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
139 |
syntheticNameChar = target.syntheticNameChar(); |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
140 |
|
15724 | 141 |
profile = Profile.instance(context); |
142 |
||
10 | 143 |
boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION); |
41637 | 144 |
boolean verboseRemoval = lint.isEnabled(LintCategory.REMOVAL); |
10 | 145 |
boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED); |
25445
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
146 |
boolean enforceMandatoryWarnings = true; |
10 | 147 |
|
813 | 148 |
deprecationHandler = new MandatoryWarningHandler(log, verboseDeprecated, |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
149 |
enforceMandatoryWarnings, "deprecated", LintCategory.DEPRECATION); |
41637 | 150 |
removalHandler = new MandatoryWarningHandler(log, verboseRemoval, |
151 |
enforceMandatoryWarnings, "removal", LintCategory.REMOVAL); |
|
813 | 152 |
uncheckedHandler = new MandatoryWarningHandler(log, verboseUnchecked, |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
153 |
enforceMandatoryWarnings, "unchecked", LintCategory.UNCHECKED); |
35810 | 154 |
sunApiHandler = new MandatoryWarningHandler(log, false, |
6151
dd513881e71d
6957438: improve code for generating warning messages containing option names
jjg
parents:
6148
diff
changeset
|
155 |
enforceMandatoryWarnings, "sunapi", null); |
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
156 |
|
19942
e9dae0e41075
8021112: Spurious unchecked warning reported by javac
jlahoda
parents:
19938
diff
changeset
|
157 |
deferredLintHandler = DeferredLintHandler.instance(context); |
10 | 158 |
} |
159 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
160 |
/** Character for synthetic names |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
161 |
*/ |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
162 |
char syntheticNameChar; |
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
163 |
|
36526 | 164 |
/** A table mapping flat names of all compiled classes for each module in this run |
165 |
* to their symbols; maintained from outside. |
|
10 | 166 |
*/ |
36526 | 167 |
private Map<Pair<ModuleSymbol, Name>,ClassSymbol> compiled = new HashMap<>(); |
10 | 168 |
|
169 |
/** A handler for messages about deprecated usage. |
|
170 |
*/ |
|
171 |
private MandatoryWarningHandler deprecationHandler; |
|
172 |
||
41637 | 173 |
/** A handler for messages about deprecated-for-removal usage. |
174 |
*/ |
|
175 |
private MandatoryWarningHandler removalHandler; |
|
176 |
||
10 | 177 |
/** A handler for messages about unchecked or unsafe usage. |
178 |
*/ |
|
179 |
private MandatoryWarningHandler uncheckedHandler; |
|
180 |
||
5848
c5a4ce47e780
6960407: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5847
diff
changeset
|
181 |
/** A handler for messages about using proprietary API. |
3661 | 182 |
*/ |
183 |
private MandatoryWarningHandler sunApiHandler; |
|
10 | 184 |
|
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
185 |
/** 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
|
186 |
*/ |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
187 |
private DeferredLintHandler deferredLintHandler; |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
188 |
|
10 | 189 |
/* ************************************************************************* |
190 |
* Errors and Warnings |
|
191 |
**************************************************************************/ |
|
192 |
||
193 |
Lint setLint(Lint newLint) { |
|
194 |
Lint prev = lint; |
|
195 |
lint = newLint; |
|
196 |
return prev; |
|
197 |
} |
|
198 |
||
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
199 |
MethodSymbol setMethod(MethodSymbol newMethod) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
200 |
MethodSymbol prev = method; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
201 |
method = newMethod; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
202 |
return prev; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
203 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
204 |
|
10 | 205 |
/** Warn about deprecated symbol. |
206 |
* @param pos Position to be used for error reporting. |
|
207 |
* @param sym The deprecated symbol. |
|
208 |
*/ |
|
209 |
void warnDeprecated(DiagnosticPosition pos, Symbol sym) { |
|
41637 | 210 |
if (sym.isDeprecatedForRemoval()) { |
211 |
if (!lint.isSuppressed(LintCategory.REMOVAL)) { |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
212 |
if (sym.kind == MDL) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
213 |
removalHandler.report(pos, Warnings.HasBeenDeprecatedForRemovalModule(sym)); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
214 |
} else { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
215 |
removalHandler.report(pos, Warnings.HasBeenDeprecatedForRemoval(sym, sym.location())); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
216 |
} |
41637 | 217 |
} |
218 |
} else if (!lint.isSuppressed(LintCategory.DEPRECATION)) { |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
219 |
if (sym.kind == MDL) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
220 |
deprecationHandler.report(pos, Warnings.HasBeenDeprecatedModule(sym)); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
221 |
} else { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
222 |
deprecationHandler.report(pos, Warnings.HasBeenDeprecated(sym, sym.location())); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
223 |
} |
41637 | 224 |
} |
10 | 225 |
} |
226 |
||
227 |
/** Warn about unchecked operation. |
|
228 |
* @param pos Position to be used for error reporting. |
|
229 |
* @param msg A string describing the problem. |
|
230 |
*/ |
|
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
231 |
public void warnUnchecked(DiagnosticPosition pos, Warning warnKey) { |
10 | 232 |
if (!lint.isSuppressed(LintCategory.UNCHECKED)) |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
233 |
uncheckedHandler.report(pos, warnKey); |
10 | 234 |
} |
235 |
||
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
236 |
/** Warn about unsafe vararg method decl. |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
237 |
* @param pos Position to be used for error reporting. |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
238 |
*/ |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
239 |
void warnUnsafeVararg(DiagnosticPosition pos, Warning warnKey) { |
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50539
diff
changeset
|
240 |
if (lint.isEnabled(LintCategory.VARARGS)) |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
241 |
log.warning(LintCategory.VARARGS, pos, warnKey); |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
242 |
} |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
243 |
|
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
244 |
public void warnStatic(DiagnosticPosition pos, Warning warnKey) { |
5002
12a9e8562200
4880220: Add a warning when accessing a static method via an reference
jjg
parents:
4867
diff
changeset
|
245 |
if (lint.isEnabled(LintCategory.STATIC)) |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
246 |
log.warning(LintCategory.STATIC, pos, warnKey); |
5002
12a9e8562200
4880220: Add a warning when accessing a static method via an reference
jjg
parents:
4867
diff
changeset
|
247 |
} |
12a9e8562200
4880220: Add a warning when accessing a static method via an reference
jjg
parents:
4867
diff
changeset
|
248 |
|
25301
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
249 |
/** Warn about division by integer constant zero. |
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
250 |
* @param pos Position to be used for error reporting. |
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
251 |
*/ |
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
252 |
void warnDivZero(DiagnosticPosition pos) { |
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
253 |
if (lint.isEnabled(LintCategory.DIVZERO)) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
254 |
log.warning(LintCategory.DIVZERO, pos, Warnings.DivZero); |
25301
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
255 |
} |
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
256 |
|
10 | 257 |
/** |
258 |
* Report any deferred diagnostics. |
|
259 |
*/ |
|
260 |
public void reportDeferredDiagnostics() { |
|
261 |
deprecationHandler.reportDeferredDiagnostic(); |
|
41637 | 262 |
removalHandler.reportDeferredDiagnostic(); |
10 | 263 |
uncheckedHandler.reportDeferredDiagnostic(); |
3661 | 264 |
sunApiHandler.reportDeferredDiagnostic(); |
10 | 265 |
} |
266 |
||
267 |
||
268 |
/** Report a failure to complete a class. |
|
269 |
* @param pos Position to be used for error reporting. |
|
270 |
* @param ex The failure to report. |
|
271 |
*/ |
|
272 |
public Type completionError(DiagnosticPosition pos, CompletionFailure ex) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
273 |
log.error(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE, pos, Errors.CantAccess(ex.sym, ex.getDetailValue())); |
45910
c7092e4591b2
8182450: javac aborts when generating ct.sym intermittently
jlahoda
parents:
45867
diff
changeset
|
274 |
return syms.errType; |
10 | 275 |
} |
276 |
||
277 |
/** Report an error that wrong type tag was found. |
|
278 |
* @param pos Position to be used for error reporting. |
|
279 |
* @param required An internationalized string describing the type tag |
|
280 |
* required. |
|
281 |
* @param found The type that was found. |
|
282 |
*/ |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
283 |
Type typeTagError(DiagnosticPosition pos, JCDiagnostic required, Object found) { |
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
284 |
// this error used to be raised by the parser, |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
285 |
// 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
|
286 |
if (found instanceof Type && ((Type)found).hasTag(VOID)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
287 |
log.error(pos, Errors.IllegalStartOfType); |
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
288 |
return syms.errType; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
289 |
} |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
290 |
log.error(pos, Errors.TypeFoundReq(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
|
291 |
return types.createErrorType(found instanceof Type ? (Type)found : syms.errType); |
10 | 292 |
} |
293 |
||
294 |
/** Report an error that symbol cannot be referenced before super |
|
295 |
* has been called. |
|
296 |
* @param pos Position to be used for error reporting. |
|
297 |
* @param sym The referenced symbol. |
|
298 |
*/ |
|
299 |
void earlyRefError(DiagnosticPosition pos, Symbol sym) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
300 |
log.error(pos, Errors.CantRefBeforeCtorCalled(sym)); |
10 | 301 |
} |
302 |
||
303 |
/** Report duplicate declaration error. |
|
304 |
*/ |
|
305 |
void duplicateError(DiagnosticPosition pos, Symbol sym) { |
|
306 |
if (!sym.type.isErroneous()) { |
|
10626
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
307 |
Symbol location = sym.location(); |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
308 |
if (location.kind == MTH && |
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
309 |
((MethodSymbol)location).isStaticOrInstanceInit()) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
310 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
311 |
Errors.AlreadyDefinedInClinit(kindName(sym), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
312 |
sym, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
313 |
kindName(sym.location()), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
314 |
kindName(sym.location().enclClass()), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
315 |
sym.location().enclClass())); |
10626
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
316 |
} else { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
317 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
318 |
Errors.AlreadyDefined(kindName(sym), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
319 |
sym, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
320 |
kindName(sym.location()), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
321 |
sym.location())); |
10626
83f0c2860f5b
7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents:
9814
diff
changeset
|
322 |
} |
10 | 323 |
} |
324 |
} |
|
325 |
||
326 |
/** Report array/varargs duplicate declaration |
|
327 |
*/ |
|
328 |
void varargsDuplicateError(DiagnosticPosition pos, Symbol sym1, Symbol sym2) { |
|
329 |
if (!sym1.type.isErroneous() && !sym2.type.isErroneous()) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
330 |
log.error(pos, Errors.ArrayAndVarargs(sym1, sym2, sym2.location())); |
10 | 331 |
} |
332 |
} |
|
333 |
||
334 |
/* ************************************************************************ |
|
335 |
* duplicate declaration checking |
|
336 |
*************************************************************************/ |
|
337 |
||
338 |
/** Check that variable does not hide variable with same name in |
|
339 |
* immediately enclosing local scope. |
|
340 |
* @param pos Position for error reporting. |
|
341 |
* @param v The symbol. |
|
342 |
* @param s The scope. |
|
343 |
*/ |
|
344 |
void checkTransparentVar(DiagnosticPosition pos, VarSymbol v, Scope s) { |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
345 |
for (Symbol sym : s.getSymbolsByName(v.name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
346 |
if (sym.owner != v.owner) break; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
347 |
if (sym.kind == VAR && |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
25874
diff
changeset
|
348 |
sym.owner.kind.matches(KindSelector.VAL_MTH) && |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
349 |
v.name != names.error) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
350 |
duplicateError(pos, sym); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
351 |
return; |
10 | 352 |
} |
353 |
} |
|
354 |
} |
|
355 |
||
356 |
/** Check that a class or interface does not hide a class or |
|
357 |
* interface with same name in immediately enclosing local scope. |
|
358 |
* @param pos Position for error reporting. |
|
359 |
* @param c The symbol. |
|
360 |
* @param s The scope. |
|
361 |
*/ |
|
362 |
void checkTransparentClass(DiagnosticPosition pos, ClassSymbol c, Scope s) { |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
363 |
for (Symbol sym : s.getSymbolsByName(c.name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
364 |
if (sym.owner != c.owner) break; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
365 |
if (sym.kind == TYP && !sym.type.hasTag(TYPEVAR) && |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
25874
diff
changeset
|
366 |
sym.owner.kind.matches(KindSelector.VAL_MTH) && |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
367 |
c.name != names.error) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
368 |
duplicateError(pos, sym); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
369 |
return; |
10 | 370 |
} |
371 |
} |
|
372 |
} |
|
373 |
||
374 |
/** Check that class does not have the same name as one of |
|
375 |
* its enclosing classes, or as a class defined in its enclosing scope. |
|
376 |
* return true if class is unique in its enclosing scope. |
|
377 |
* @param pos Position for error reporting. |
|
378 |
* @param name The class name. |
|
379 |
* @param s The enclosing scope. |
|
380 |
*/ |
|
381 |
boolean checkUniqueClassName(DiagnosticPosition pos, Name name, Scope s) { |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
382 |
for (Symbol sym : s.getSymbolsByName(name, NON_RECURSIVE)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
383 |
if (sym.kind == TYP && sym.name != names.error) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
384 |
duplicateError(pos, sym); |
10 | 385 |
return false; |
386 |
} |
|
387 |
} |
|
388 |
for (Symbol sym = s.owner; sym != null; sym = sym.owner) { |
|
389 |
if (sym.kind == TYP && sym.name == name && sym.name != names.error) { |
|
390 |
duplicateError(pos, sym); |
|
391 |
return true; |
|
392 |
} |
|
393 |
} |
|
394 |
return true; |
|
395 |
} |
|
396 |
||
397 |
/* ************************************************************************* |
|
398 |
* Class name generation |
|
399 |
**************************************************************************/ |
|
400 |
||
33020
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
401 |
|
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
402 |
private Map<Pair<Name, Name>, Integer> localClassNameIndexes = new HashMap<>(); |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
403 |
|
10 | 404 |
/** Return name of local class. |
14259 | 405 |
* This is of the form {@code <enclClass> $ n <classname> } |
10 | 406 |
* where |
407 |
* enclClass is the flat name of the enclosing class, |
|
408 |
* classname is the simple name of the local class |
|
409 |
*/ |
|
55622
0b470386f5f7
8223443: Calling Trees.getScope early changes names of local/anonymous classes
jlahoda
parents:
55358
diff
changeset
|
410 |
public Name localClassName(ClassSymbol c) { |
33020
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
411 |
Name enclFlatname = c.owner.enclClass().flatname; |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
412 |
String enclFlatnameStr = enclFlatname.toString(); |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
413 |
Pair<Name, Name> key = new Pair<>(enclFlatname, c.name); |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
414 |
Integer index = localClassNameIndexes.get(key); |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
415 |
for (int i = (index == null) ? 1 : index; ; i++) { |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
416 |
Name flatname = names.fromString(enclFlatnameStr |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
417 |
+ syntheticNameChar + i + c.name); |
36526 | 418 |
if (getCompiled(c.packge().modle, flatname) == null) { |
33020
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
419 |
localClassNameIndexes.put(key, i + 1); |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
420 |
return flatname; |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
421 |
} |
10 | 422 |
} |
423 |
} |
|
424 |
||
55622
0b470386f5f7
8223443: Calling Trees.getScope early changes names of local/anonymous classes
jlahoda
parents:
55358
diff
changeset
|
425 |
public void clearLocalClassNameIndexes(ClassSymbol c) { |
43139 | 426 |
if (c.owner != null && c.owner.kind != NIL) { |
427 |
localClassNameIndexes.remove(new Pair<>( |
|
428 |
c.owner.enclClass().flatname, c.name)); |
|
429 |
} |
|
33020
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
430 |
} |
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
431 |
|
23810
b92eb80925f0
8038455: Use single Context for all rounds of annotation processing
jlahoda
parents:
23803
diff
changeset
|
432 |
public void newRound() { |
b92eb80925f0
8038455: Use single Context for all rounds of annotation processing
jlahoda
parents:
23803
diff
changeset
|
433 |
compiled.clear(); |
33020
7ed4f7ff42c5
8000316: Huge performance bottleneck in com.sun.tools.javac.comp.Check.localClassName
sadayapalam
parents:
32910
diff
changeset
|
434 |
localClassNameIndexes.clear(); |
23810
b92eb80925f0
8038455: Use single Context for all rounds of annotation processing
jlahoda
parents:
23803
diff
changeset
|
435 |
} |
b92eb80925f0
8038455: Use single Context for all rounds of annotation processing
jlahoda
parents:
23803
diff
changeset
|
436 |
|
36526 | 437 |
public void putCompiled(ClassSymbol csym) { |
438 |
compiled.put(Pair.of(csym.packge().modle, csym.flatname), csym); |
|
439 |
} |
|
440 |
||
441 |
public ClassSymbol getCompiled(ClassSymbol csym) { |
|
442 |
return compiled.get(Pair.of(csym.packge().modle, csym.flatname)); |
|
443 |
} |
|
444 |
||
445 |
public ClassSymbol getCompiled(ModuleSymbol msym, Name flatname) { |
|
446 |
return compiled.get(Pair.of(msym, flatname)); |
|
447 |
} |
|
448 |
||
449 |
public void removeCompiled(ClassSymbol csym) { |
|
450 |
compiled.remove(Pair.of(csym.packge().modle, csym.flatname)); |
|
451 |
} |
|
452 |
||
10 | 453 |
/* ************************************************************************* |
454 |
* Type Checking |
|
455 |
**************************************************************************/ |
|
456 |
||
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
457 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
458 |
* 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
|
459 |
* checks - depending on the check context, meaning of 'compatibility' might |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
460 |
* vary significantly. |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
461 |
*/ |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
462 |
public interface CheckContext { |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
463 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
464 |
* Is type 'found' compatible with type 'req' in given context |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
465 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
466 |
boolean compatible(Type found, Type req, Warner warn); |
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 |
* Report a check error |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
469 |
*/ |
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
470 |
void report(DiagnosticPosition pos, JCDiagnostic details); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
471 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
472 |
* Obtain a warner for this check context |
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 |
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
|
475 |
|
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
31560
diff
changeset
|
476 |
public InferenceContext inferenceContext(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
477 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
478 |
public DeferredAttr.DeferredAttrContext deferredAttrContext(); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
479 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
480 |
|
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 |
* 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
|
483 |
* context - useful to check sub-expressions. The default behavior simply |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
484 |
* redirects all method calls to the enclosing check context leveraging |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
485 |
* the forwarding pattern. |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
486 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
487 |
static class NestedCheckContext implements CheckContext { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
488 |
CheckContext enclosingContext; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
489 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
490 |
NestedCheckContext(CheckContext enclosingContext) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
491 |
this.enclosingContext = enclosingContext; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
492 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
493 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
494 |
public boolean compatible(Type found, Type req, Warner warn) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
495 |
return enclosingContext.compatible(found, req, warn); |
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 |
|
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
498 |
public void report(DiagnosticPosition pos, JCDiagnostic details) { |
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
499 |
enclosingContext.report(pos, details); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
500 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
501 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
502 |
public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
503 |
return enclosingContext.checkWarner(pos, found, req); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
504 |
} |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
505 |
|
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
31560
diff
changeset
|
506 |
public InferenceContext inferenceContext() { |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
507 |
return enclosingContext.inferenceContext(); |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
508 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
509 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
510 |
public DeferredAttrContext deferredAttrContext() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
511 |
return enclosingContext.deferredAttrContext(); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
512 |
} |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
513 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
514 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
515 |
/** |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
516 |
* Check context to be used when evaluating assignment/return statements |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
517 |
*/ |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
518 |
CheckContext basicHandler = new CheckContext() { |
13438
83729994273a
7175911: Simplify error reporting API in Check.CheckContext interface
mcimadamore
parents:
12915
diff
changeset
|
519 |
public void report(DiagnosticPosition pos, JCDiagnostic details) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
520 |
log.error(pos, Errors.ProbFoundReq(details)); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
521 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
522 |
public boolean compatible(Type found, Type req, Warner warn) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
523 |
return types.isAssignable(found, req, warn); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
524 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
525 |
|
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
526 |
public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) { |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
527 |
return convertWarner(pos, found, req); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
528 |
} |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
529 |
|
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
530 |
public InferenceContext inferenceContext() { |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
531 |
return infer.emptyContext; |
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
532 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
533 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
534 |
public DeferredAttrContext deferredAttrContext() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
535 |
return deferredAttr.emptyDeferredAttrContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
14054
diff
changeset
|
536 |
} |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24219
diff
changeset
|
537 |
|
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24219
diff
changeset
|
538 |
@Override |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24219
diff
changeset
|
539 |
public String toString() { |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24219
diff
changeset
|
540 |
return "CheckContext: basicHandler"; |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24219
diff
changeset
|
541 |
} |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
542 |
}; |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
543 |
|
10 | 544 |
/** Check that a given type is assignable to a given proto-type. |
545 |
* If it is, return the type, otherwise return errType. |
|
546 |
* @param pos Position to be used for error reporting. |
|
547 |
* @param found The type that was found. |
|
548 |
* @param req The type that was required. |
|
549 |
*/ |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
550 |
public Type checkType(DiagnosticPosition pos, Type found, Type req) { |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
551 |
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
|
552 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6147
diff
changeset
|
553 |
|
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
554 |
Type checkType(final DiagnosticPosition pos, final Type found, final Type req, final CheckContext checkContext) { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
31560
diff
changeset
|
555 |
final InferenceContext inferenceContext = checkContext.inferenceContext(); |
25279 | 556 |
if (inferenceContext.free(req) || inferenceContext.free(found)) { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
557 |
inferenceContext.addFreeTypeListener(List.of(req, found), |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
558 |
solvedContext -> checkType(pos, solvedContext.asInstType(found), solvedContext.asInstType(req), checkContext)); |
14047
7c7a5611cf76
7175433: Inference cleanup: add helper class to handle inference variables
mcimadamore
parents:
13844
diff
changeset
|
559 |
} |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
560 |
if (req.hasTag(ERROR)) |
10 | 561 |
return req; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
562 |
if (req.hasTag(NONE)) |
10 | 563 |
return found; |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
564 |
if (checkContext.compatible(found, req, checkContext.checkWarner(pos, found, req))) { |
10 | 565 |
return found; |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
566 |
} else { |
18395
d56a5fbf0b32
8016267: javac, TypeTag refactoring has provoked performance issues
vromero
parents:
18393
diff
changeset
|
567 |
if (found.isNumeric() && req.isNumeric()) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
568 |
checkContext.report(pos, diags.fragment(Fragments.PossibleLossOfPrecision(found, req))); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
569 |
return types.createErrorType(found); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
570 |
} |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
571 |
checkContext.report(pos, diags.fragment(Fragments.InconvertibleTypes(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
|
572 |
return types.createErrorType(found); |
10 | 573 |
} |
574 |
} |
|
575 |
||
576 |
/** Check that a given type can be cast to a given target type. |
|
577 |
* Return the result of the cast. |
|
578 |
* @param pos Position to be used for error reporting. |
|
579 |
* @param found The type that is being cast. |
|
580 |
* @param req The target type of the cast. |
|
581 |
*/ |
|
582 |
Type checkCastable(DiagnosticPosition pos, Type found, Type req) { |
|
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
583 |
return checkCastable(pos, found, req, basicHandler); |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
584 |
} |
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
585 |
Type checkCastable(DiagnosticPosition pos, Type found, Type req, CheckContext checkContext) { |
12915
28cf1e0dafdc
7166552: Inference: cleanup usage of Type.ForAll
mcimadamore
parents:
12335
diff
changeset
|
586 |
if (types.isCastable(found, req, castWarner(pos, found, req))) { |
10 | 587 |
return req; |
588 |
} else { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
589 |
checkContext.report(pos, diags.fragment(Fragments.InconvertibleTypes(found, req))); |
12334
29e1bfdcba4e
7151492: Encapsulate check logic into Attr.ResultInfo
mcimadamore
parents:
12333
diff
changeset
|
590 |
return types.createErrorType(found); |
10 | 591 |
} |
592 |
} |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
593 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
594 |
/** 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
|
595 |
* 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
|
596 |
*/ |
19942
e9dae0e41075
8021112: Spurious unchecked warning reported by javac
jlahoda
parents:
19938
diff
changeset
|
597 |
public void checkRedundantCast(Env<AttrContext> env, final JCTypeCast tree) { |
e9dae0e41075
8021112: Spurious unchecked warning reported by javac
jlahoda
parents:
19938
diff
changeset
|
598 |
if (!tree.type.isErroneous() |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
599 |
&& types.isSameType(tree.expr.type, tree.clazz.type) |
15385 | 600 |
&& !(ignoreAnnotatedCasts && TreeInfo.containsTypeAnnotation(tree.clazz)) |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
601 |
&& !is292targetTypeCast(tree)) { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
602 |
deferredLintHandler.report(() -> { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
603 |
if (lint.isEnabled(LintCategory.CAST)) |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
604 |
log.warning(LintCategory.CAST, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
605 |
tree.pos(), Warnings.RedundantCast(tree.clazz.type)); |
19942
e9dae0e41075
8021112: Spurious unchecked warning reported by javac
jlahoda
parents:
19938
diff
changeset
|
606 |
}); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
607 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
608 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
609 |
//where |
15385 | 610 |
private boolean is292targetTypeCast(JCTypeCast tree) { |
611 |
boolean is292targetTypeCast = false; |
|
612 |
JCExpression expr = TreeInfo.skipParens(tree.expr); |
|
613 |
if (expr.hasTag(APPLY)) { |
|
614 |
JCMethodInvocation apply = (JCMethodInvocation)expr; |
|
615 |
Symbol sym = TreeInfo.symbol(apply.meth); |
|
616 |
is292targetTypeCast = sym != null && |
|
617 |
sym.kind == MTH && |
|
618 |
(sym.flags() & HYPOTHETICAL) != 0; |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
619 |
} |
15385 | 620 |
return is292targetTypeCast; |
621 |
} |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
12087
diff
changeset
|
622 |
|
15385 | 623 |
private static final boolean ignoreAnnotatedCasts = true; |
10 | 624 |
|
625 |
/** Check that a type is within some bounds. |
|
626 |
* |
|
14259 | 627 |
* Used in TypeApply to verify that, e.g., X in {@code V<X>} is a valid |
10 | 628 |
* type argument. |
629 |
* @param a The type that should be bounded by bs. |
|
14259 | 630 |
* @param bound The bound. |
10 | 631 |
*/ |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
632 |
private boolean checkExtends(Type a, Type bound) { |
1527 | 633 |
if (a.isUnbound()) { |
8037 | 634 |
return true; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
635 |
} else if (!a.hasTag(WILDCARD)) { |
24612
75dc732b45af
8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents:
24604
diff
changeset
|
636 |
a = types.cvarUpperBound(a); |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
637 |
return types.isSubtype(a, bound); |
1527 | 638 |
} else if (a.isExtendsBound()) { |
24612
75dc732b45af
8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents:
24604
diff
changeset
|
639 |
return types.isCastable(bound, types.wildUpperBound(a), types.noWarnings); |
1527 | 640 |
} else if (a.isSuperBound()) { |
24293
0d889f759fac
8033718: Inference ignores capture variable as upper bound
dlsmith
parents:
24226
diff
changeset
|
641 |
return !types.notSoftSubtype(types.wildLowerBound(a), bound); |
1527 | 642 |
} |
8037 | 643 |
return true; |
1527 | 644 |
} |
10 | 645 |
|
646 |
/** Check that type is different from 'void'. |
|
647 |
* @param pos Position to be used for error reporting. |
|
648 |
* @param t The type to be checked. |
|
649 |
*/ |
|
650 |
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
|
651 |
if (t.hasTag(VOID)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
652 |
log.error(pos, Errors.VoidNotAllowedHere); |
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
|
653 |
return types.createErrorType(t); |
10 | 654 |
} else { |
655 |
return t; |
|
656 |
} |
|
657 |
} |
|
658 |
||
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
659 |
Type checkClassOrArrayType(DiagnosticPosition pos, Type t) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
660 |
if (!t.hasTag(CLASS) && !t.hasTag(ARRAY) && !t.hasTag(ERROR)) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
661 |
return typeTagError(pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
662 |
diags.fragment(Fragments.TypeReqClassArray), |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
663 |
asTypeParam(t)); |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
664 |
} else { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
665 |
return t; |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
666 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
667 |
} |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
668 |
|
10 | 669 |
/** Check that type is a class or interface type. |
670 |
* @param pos Position to be used for error reporting. |
|
671 |
* @param t The type to be checked. |
|
672 |
*/ |
|
673 |
Type checkClassType(DiagnosticPosition pos, Type t) { |
|
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
674 |
if (!t.hasTag(CLASS) && !t.hasTag(ERROR)) { |
10 | 675 |
return typeTagError(pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
676 |
diags.fragment(Fragments.TypeReqClass), |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
677 |
asTypeParam(t)); |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
678 |
} else { |
10 | 679 |
return t; |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
680 |
} |
10 | 681 |
} |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
682 |
//where |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
683 |
private Object asTypeParam(Type t) { |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
684 |
return (t.hasTag(TYPEVAR)) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
685 |
? diags.fragment(Fragments.TypeParameter(t)) |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
686 |
: t; |
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
687 |
} |
10 | 688 |
|
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
689 |
/** 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
|
690 |
*/ |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
691 |
Type checkConstructorRefType(DiagnosticPosition pos, Type t) { |
15360
450af2a9e3c9
8005854: Add support for array constructor references
mcimadamore
parents:
15356
diff
changeset
|
692 |
t = checkClassOrArrayType(pos, t); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
693 |
if (t.hasTag(CLASS)) { |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
694 |
if ((t.tsym.flags() & (ABSTRACT | INTERFACE)) != 0) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
695 |
log.error(pos, Errors.AbstractCantBeInstantiated(t.tsym)); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
696 |
t = types.createErrorType(t); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
697 |
} else if ((t.tsym.flags() & ENUM) != 0) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
698 |
log.error(pos, Errors.EnumCantBeInstantiated); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
699 |
t = types.createErrorType(t); |
16340
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
700 |
} else { |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
701 |
t = checkClassType(pos, t, true); |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
702 |
} |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
703 |
} else if (t.hasTag(ARRAY)) { |
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
704 |
if (!types.isReifiable(((ArrayType)t).elemtype)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
705 |
log.error(pos, Errors.GenericArrayCreation); |
16340
3c0af3413e0f
8008540: Constructor reference to non-reifiable array should be rejected
mcimadamore
parents:
16333
diff
changeset
|
706 |
t = types.createErrorType(t); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
707 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
708 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
709 |
return t; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
710 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
711 |
|
10 | 712 |
/** Check that type is a class or interface type. |
713 |
* @param pos Position to be used for error reporting. |
|
714 |
* @param t The type to be checked. |
|
715 |
* @param noBounds True if type bounds are illegal here. |
|
716 |
*/ |
|
717 |
Type checkClassType(DiagnosticPosition pos, Type t, boolean noBounds) { |
|
718 |
t = checkClassType(pos, t); |
|
719 |
if (noBounds && t.isParameterized()) { |
|
720 |
List<Type> args = t.getTypeArguments(); |
|
721 |
while (args.nonEmpty()) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
722 |
if (args.head.hasTag(WILDCARD)) |
10 | 723 |
return typeTagError(pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
724 |
diags.fragment(Fragments.TypeReqExact), |
10 | 725 |
args.head); |
726 |
args = args.tail; |
|
727 |
} |
|
728 |
} |
|
729 |
return t; |
|
730 |
} |
|
731 |
||
732 |
/** Check that type is a reference type, i.e. a class, interface or array type |
|
733 |
* or a type variable. |
|
734 |
* @param pos Position to be used for error reporting. |
|
735 |
* @param t The type to be checked. |
|
736 |
*/ |
|
737 |
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
|
738 |
if (t.isReference()) |
10 | 739 |
return t; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
740 |
else |
10 | 741 |
return typeTagError(pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
742 |
diags.fragment(Fragments.TypeReqRef), |
10 | 743 |
t); |
744 |
} |
|
745 |
||
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
746 |
/** 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
|
747 |
* or a type variable. |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
748 |
* @param trees Original trees, used for error reporting. |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
749 |
* @param types The types to be checked. |
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 |
List<Type> checkRefTypes(List<JCExpression> trees, List<Type> types) { |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
752 |
List<JCExpression> tl = trees; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
753 |
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
|
754 |
l.head = checkRefType(tl.head.pos(), l.head); |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
755 |
tl = tl.tail; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
756 |
} |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
757 |
return types; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
758 |
} |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2509
diff
changeset
|
759 |
|
10 | 760 |
/** Check that type is a null or reference type. |
761 |
* @param pos Position to be used for error reporting. |
|
762 |
* @param t The type to be checked. |
|
763 |
*/ |
|
764 |
Type checkNullOrRefType(DiagnosticPosition pos, Type t) { |
|
18395
d56a5fbf0b32
8016267: javac, TypeTag refactoring has provoked performance issues
vromero
parents:
18393
diff
changeset
|
765 |
if (t.isReference() || t.hasTag(BOT)) |
10 | 766 |
return t; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
767 |
else |
10 | 768 |
return typeTagError(pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
769 |
diags.fragment(Fragments.TypeReqRef), |
10 | 770 |
t); |
771 |
} |
|
772 |
||
773 |
/** Check that flag set does not contain elements of two conflicting sets. s |
|
774 |
* Return true if it doesn't. |
|
775 |
* @param pos Position to be used for error reporting. |
|
776 |
* @param flags The set of flags to be checked. |
|
777 |
* @param set1 Conflicting flags set #1. |
|
778 |
* @param set2 Conflicting flags set #2. |
|
779 |
*/ |
|
780 |
boolean checkDisjoint(DiagnosticPosition pos, long flags, long set1, long set2) { |
|
781 |
if ((flags & set1) != 0 && (flags & set2) != 0) { |
|
782 |
log.error(pos, |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
783 |
Errors.IllegalCombinationOfModifiers(asFlagSet(TreeInfo.firstFlag(flags & set1)), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
784 |
asFlagSet(TreeInfo.firstFlag(flags & set2)))); |
10 | 785 |
return false; |
786 |
} else |
|
787 |
return true; |
|
788 |
} |
|
789 |
||
8635
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
790 |
/** 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
|
791 |
* 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
|
792 |
*/ |
8635
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
793 |
Type checkDiamond(JCNewClass tree, Type t) { |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
794 |
if (!TreeInfo.isDiamond(tree) || |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
795 |
t.isErroneous()) { |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
796 |
return checkClassType(tree.clazz.pos(), t, true); |
383a416a2bdf
7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
mcimadamore
parents:
8628
diff
changeset
|
797 |
} else { |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
798 |
if (tree.def != null && !Feature.DIAMOND_WITH_ANONYMOUS_CLASS_CREATION.allowedInSource(source)) { |
40504
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
799 |
log.error(DiagnosticFlag.SOURCE_LEVEL, tree.clazz.pos(), |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
800 |
Errors.CantApplyDiamond1(t, Feature.DIAMOND_WITH_ANONYMOUS_CLASS_CREATION.fragment(source.name))); |
40504
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
801 |
} |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
802 |
if (t.tsym.type.getTypeArguments().isEmpty()) { |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
803 |
log.error(tree.clazz.pos(), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
804 |
Errors.CantApplyDiamond1(t, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
805 |
Fragments.DiamondNonGeneric(t))); |
40504
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
806 |
return types.createErrorType(t); |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
807 |
} else if (tree.typeargs != null && |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
808 |
tree.typeargs.nonEmpty()) { |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
809 |
log.error(tree.clazz.pos(), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
810 |
Errors.CantApplyDiamond1(t, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
811 |
Fragments.DiamondAndExplicitParams(t))); |
40504
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
812 |
return types.createErrorType(t); |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
813 |
} else { |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
814 |
return t; |
0a01f6710c84
8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents:
40313
diff
changeset
|
815 |
} |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
816 |
} |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
817 |
} |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
818 |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
819 |
/** Check that the type inferred using the diamond operator does not contain |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
820 |
* non-denotable types such as captured types or intersection types. |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
821 |
* @param t the type inferred using the diamond operator |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
822 |
* @return the (possibly empty) list of non-denotable types. |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
823 |
*/ |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
824 |
List<Type> checkDiamondDenotable(ClassType t) { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
825 |
ListBuffer<Type> buf = new ListBuffer<>(); |
32910
064f2f066668
8132535: Compiler fails with diamond anonymous class creation with intersection bound of enclosing class
sadayapalam
parents:
32709
diff
changeset
|
826 |
for (Type arg : t.allparams()) { |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
827 |
if (!checkDenotable(arg)) { |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
828 |
buf.append(arg); |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
829 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
830 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
831 |
return buf.toList(); |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
832 |
} |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
833 |
|
49294
3556298e481d
8199910: Compiler crashes with -g option and variables of intersection type inferred by `var`
mcimadamore
parents:
48721
diff
changeset
|
834 |
public boolean checkDenotable(Type t) { |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
835 |
return denotableChecker.visit(t, null); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
836 |
} |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
837 |
// where |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
838 |
|
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
839 |
/** diamondTypeChecker: A type visitor that descends down the given type looking for non-denotable |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
840 |
* types. The visit methods return false as soon as a non-denotable type is encountered and true |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
841 |
* otherwise. |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
842 |
*/ |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
843 |
private static final Types.SimpleVisitor<Boolean, Void> denotableChecker = new Types.SimpleVisitor<Boolean, Void>() { |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
844 |
@Override |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
845 |
public Boolean visitType(Type t, Void s) { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
846 |
return true; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
847 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
848 |
@Override |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
849 |
public Boolean visitClassType(ClassType t, Void s) { |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
850 |
if (t.isUnion() || t.isIntersection()) { |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
851 |
return false; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
852 |
} |
32910
064f2f066668
8132535: Compiler fails with diamond anonymous class creation with intersection bound of enclosing class
sadayapalam
parents:
32709
diff
changeset
|
853 |
for (Type targ : t.allparams()) { |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
854 |
if (!visit(targ, s)) { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
855 |
return false; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
856 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
857 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
858 |
return true; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
859 |
} |
30403
c904bbdc5ec1
8078592: Compiler fails to reject erroneous use of diamond with anonymous classes involving "fresh" type variables.
sadayapalam
parents:
30069
diff
changeset
|
860 |
|
c904bbdc5ec1
8078592: Compiler fails to reject erroneous use of diamond with anonymous classes involving "fresh" type variables.
sadayapalam
parents:
30069
diff
changeset
|
861 |
@Override |
c904bbdc5ec1
8078592: Compiler fails to reject erroneous use of diamond with anonymous classes involving "fresh" type variables.
sadayapalam
parents:
30069
diff
changeset
|
862 |
public Boolean visitTypeVar(TypeVar t, Void s) { |
c904bbdc5ec1
8078592: Compiler fails to reject erroneous use of diamond with anonymous classes involving "fresh" type variables.
sadayapalam
parents:
30069
diff
changeset
|
863 |
/* Any type variable mentioned in the inferred type must have been declared as a type parameter |
32910
064f2f066668
8132535: Compiler fails with diamond anonymous class creation with intersection bound of enclosing class
sadayapalam
parents:
32709
diff
changeset
|
864 |
(i.e cannot have been produced by inference (18.4)) |
30403
c904bbdc5ec1
8078592: Compiler fails to reject erroneous use of diamond with anonymous classes involving "fresh" type variables.
sadayapalam
parents:
30069
diff
changeset
|
865 |
*/ |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
866 |
return (t.tsym.flags() & SYNTHETIC) == 0; |
30403
c904bbdc5ec1
8078592: Compiler fails to reject erroneous use of diamond with anonymous classes involving "fresh" type variables.
sadayapalam
parents:
30069
diff
changeset
|
867 |
} |
c904bbdc5ec1
8078592: Compiler fails to reject erroneous use of diamond with anonymous classes involving "fresh" type variables.
sadayapalam
parents:
30069
diff
changeset
|
868 |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
869 |
@Override |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
870 |
public Boolean visitCapturedType(CapturedType t, Void s) { |
32910
064f2f066668
8132535: Compiler fails with diamond anonymous class creation with intersection bound of enclosing class
sadayapalam
parents:
32709
diff
changeset
|
871 |
/* Any type variable mentioned in the inferred type must have been declared as a type parameter |
064f2f066668
8132535: Compiler fails with diamond anonymous class creation with intersection bound of enclosing class
sadayapalam
parents:
32709
diff
changeset
|
872 |
(i.e cannot have been produced by capture conversion (5.1.10)) |
064f2f066668
8132535: Compiler fails with diamond anonymous class creation with intersection bound of enclosing class
sadayapalam
parents:
32709
diff
changeset
|
873 |
*/ |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
874 |
return false; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
875 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
876 |
|
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
877 |
@Override |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
878 |
public Boolean visitArrayType(ArrayType t, Void s) { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
879 |
return visit(t.elemtype, s); |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
880 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
881 |
|
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
882 |
@Override |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
883 |
public Boolean visitWildcardType(WildcardType t, Void s) { |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
884 |
return visit(t.type, s); |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
885 |
} |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
886 |
}; |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
887 |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
888 |
void checkVarargsMethodDecl(Env<AttrContext> env, JCMethodDecl tree) { |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
889 |
MethodSymbol m = tree.sym; |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
890 |
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
|
891 |
Type varargElemType = null; |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
892 |
if (m.isVarArgs()) { |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
893 |
varargElemType = types.elemtype(tree.params.last().type); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
894 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
895 |
if (hasTrustMeAnno && !isTrustMeAllowedOnMethod(m)) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
896 |
if (varargElemType != null) { |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
897 |
JCDiagnostic msg = Feature.PRIVATE_SAFE_VARARGS.allowedInSource(source) ? |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
898 |
diags.fragment(Fragments.VarargsTrustmeOnVirtualVarargs(m)) : |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
899 |
diags.fragment(Fragments.VarargsTrustmeOnVirtualVarargsFinalOnly(m)); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
900 |
log.error(tree, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
901 |
Errors.VarargsInvalidTrustmeAnno(syms.trustMeType.tsym, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
902 |
msg)); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
903 |
} else { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
904 |
log.error(tree, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
905 |
Errors.VarargsInvalidTrustmeAnno(syms.trustMeType.tsym, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
906 |
Fragments.VarargsTrustmeOnNonVarargsMeth(m))); |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
907 |
} |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
908 |
} else if (hasTrustMeAnno && varargElemType != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
909 |
types.isReifiable(varargElemType)) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
910 |
warnUnsafeVararg(tree, Warnings.VarargsRedundantTrustmeAnno( |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
911 |
syms.trustMeType.tsym, |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
912 |
diags.fragment(Fragments.VarargsTrustmeOnReifiableVarargs(varargElemType)))); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
913 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
914 |
else if (!hasTrustMeAnno && varargElemType != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
915 |
!types.isReifiable(varargElemType)) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
916 |
warnUnchecked(tree.params.head.pos(), Warnings.UncheckedVarargsNonReifiableType(varargElemType)); |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
917 |
} |
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
918 |
} |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
919 |
//where |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
920 |
private boolean isTrustMeAllowedOnMethod(Symbol s) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
921 |
return (s.flags() & VARARGS) != 0 && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
922 |
(s.isConstructor() || |
25283
082d51b7010b
7196160: Project Coin: allow @SafeVarargs on private methods
darcy
parents:
25279
diff
changeset
|
923 |
(s.flags() & (STATIC | FINAL | |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
924 |
(Feature.PRIVATE_SAFE_VARARGS.allowedInSource(source) ? PRIVATE : 0) )) != 0); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
925 |
} |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
926 |
|
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
927 |
Type checkLocalVarType(DiagnosticPosition pos, Type t, Name name) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
928 |
//check that resulting type is not the null type |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
929 |
if (t.hasTag(BOT)) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
930 |
log.error(pos, Errors.CantInferLocalVarType(name, Fragments.LocalCantInferNull)); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
931 |
return types.createErrorType(t); |
47934
6373d9a0ad82
8191834: Assigning a void expression to a "var" crashes the compiler
mcimadamore
parents:
47873
diff
changeset
|
932 |
} else if (t.hasTag(VOID)) { |
6373d9a0ad82
8191834: Assigning a void expression to a "var" crashes the compiler
mcimadamore
parents:
47873
diff
changeset
|
933 |
log.error(pos, Errors.CantInferLocalVarType(name, Fragments.LocalCantInferVoid)); |
6373d9a0ad82
8191834: Assigning a void expression to a "var" crashes the compiler
mcimadamore
parents:
47873
diff
changeset
|
934 |
return types.createErrorType(t); |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
935 |
} |
47959
5dd899009525
8191802: Upward projection result is A<? extends Number> instead of A<? super Integer>
mcimadamore
parents:
47948
diff
changeset
|
936 |
|
5dd899009525
8191802: Upward projection result is A<? extends Number> instead of A<? super Integer>
mcimadamore
parents:
47948
diff
changeset
|
937 |
//upward project the initializer type |
5dd899009525
8191802: Upward projection result is A<? extends Number> instead of A<? super Integer>
mcimadamore
parents:
47948
diff
changeset
|
938 |
return types.upward(t, types.captures(t)); |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
939 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
940 |
|
18381
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
941 |
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
|
942 |
final Symbol sym, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
943 |
final Env<AttrContext> env, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
944 |
final List<JCExpression> argtrees, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
945 |
final List<Type> argtypes, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
946 |
final boolean useVarargs, |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
947 |
InferenceContext inferenceContext) { |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
948 |
// System.out.println("call : " + env.tree); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
949 |
// System.out.println("method : " + owntype); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
950 |
// 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
|
951 |
if (inferenceContext.free(mtype)) { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
952 |
inferenceContext.addFreeTypeListener(List.of(mtype), |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
953 |
solvedContext -> checkMethod(solvedContext.asInstType(mtype), sym, env, argtrees, argtypes, useVarargs, solvedContext)); |
18381
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
954 |
return mtype; |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
955 |
} |
56a7f54f4166
8015432: javac crashes with stack overflow when method called recursively from nested generic call
mcimadamore
parents:
18380
diff
changeset
|
956 |
Type owntype = mtype; |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
957 |
List<Type> formals = owntype.getParameterTypes(); |
19506
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
958 |
List<Type> nonInferred = sym.type.getParameterTypes(); |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
959 |
if (nonInferred.length() != formals.length()) nonInferred = formals; |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
960 |
Type last = useVarargs ? formals.last() : null; |
19506
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
961 |
if (sym.name == names.init && sym.owner == syms.enumSym) { |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
962 |
formals = formals.tail.tail; |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
963 |
nonInferred = nonInferred.tail.tail; |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
964 |
} |
47248 | 965 |
if ((sym.flags() & ANONCONSTR_BASED) != 0) { |
966 |
formals = formals.tail; |
|
967 |
nonInferred = nonInferred.tail; |
|
968 |
} |
|
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
969 |
List<JCExpression> args = argtrees; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
970 |
if (args != null) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
971 |
//this is null when type-checking a method reference |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
972 |
while (formals.head != last) { |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
973 |
JCTree arg = args.head; |
19506
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
974 |
Warner warn = convertWarner(arg.pos(), arg.type, nonInferred.head); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
975 |
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
|
976 |
args = args.tail; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
977 |
formals = formals.tail; |
19506
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
978 |
nonInferred = nonInferred.tail; |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
979 |
} |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
980 |
if (useVarargs) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
981 |
Type varArg = types.elemtype(last); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
982 |
while (args.tail != null) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
983 |
JCTree arg = args.head; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
984 |
Warner warn = convertWarner(arg.pos(), arg.type, varArg); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
985 |
assertConvertible(arg, arg.type, varArg, warn); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
986 |
args = args.tail; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
987 |
} |
25445
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
988 |
} else if ((sym.flags() & (VARARGS | SIGNATURE_POLYMORPHIC)) == VARARGS) { |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
989 |
// non-varargs call to varargs method |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
990 |
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
|
991 |
Type lastArg = argtypes.last(); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
992 |
if (types.isSubtypeUnchecked(lastArg, types.elemtype(varParam)) && |
19506
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
993 |
!types.isSameType(types.erasure(varParam), types.erasure(lastArg))) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
994 |
log.warning(argtrees.last().pos(), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
995 |
Warnings.InexactNonVarargsCall(types.elemtype(varParam),varParam)); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
996 |
} |
5846
6df0e6bcb388
6945418: Project Coin: Simplified Varargs Method Invocation
mcimadamore
parents:
5842
diff
changeset
|
997 |
} |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
998 |
if (useVarargs) { |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
999 |
Type argtype = owntype.getParameterTypes().last(); |
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
1000 |
if (!types.isReifiable(argtype) && |
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50539
diff
changeset
|
1001 |
(sym.baseSymbol().attribute(syms.trustMeType.tsym) == null || |
19506
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1002 |
!isTrustMeAllowedOnMethod(sym))) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
1003 |
warnUnchecked(env.tree.pos(), Warnings.UncheckedGenericArrayCreation(argtype)); |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
1004 |
} |
50250
04f9bb270ab8
8203488: Remove error generation from TransTypes
mcimadamore
parents:
50213
diff
changeset
|
1005 |
TreeInfo.setVarargsElement(env.tree, types.elemtype(argtype)); |
04f9bb270ab8
8203488: Remove error generation from TransTypes
mcimadamore
parents:
50213
diff
changeset
|
1006 |
} |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
1007 |
return owntype; |
5489
e7af65bf7577
6730476: invalid "unchecked generic array" warning
mcimadamore
parents:
5321
diff
changeset
|
1008 |
} |
12080
23101f54df44
7144506: Attr.checkMethod should be called after inference variables have been fixed
mcimadamore
parents:
12079
diff
changeset
|
1009 |
//where |
19506
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1010 |
private void assertConvertible(JCTree tree, Type actual, Type formal, Warner warn) { |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1011 |
if (types.isConvertible(actual, formal, warn)) |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1012 |
return; |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1013 |
|
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1014 |
if (formal.isCompound() |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1015 |
&& types.isSubtype(actual, types.supertype(formal)) |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1016 |
&& types.isSubtypeUnchecked(actual, types.interfaces(formal), warn)) |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1017 |
return; |
9314c30fef42
7182350: Regression in wording of unchecked warning message
kizune
parents:
19503
diff
changeset
|
1018 |
} |
5489
e7af65bf7577
6730476: invalid "unchecked generic array" warning
mcimadamore
parents:
5321
diff
changeset
|
1019 |
|
8037 | 1020 |
/** |
1021 |
* Check that type 't' is a valid instantiation of a generic class |
|
1022 |
* (see JLS 4.5) |
|
1023 |
* |
|
1024 |
* @param t class type to be checked |
|
1025 |
* @return true if 't' is well-formed |
|
1026 |
*/ |
|
1027 |
public boolean checkValidGenericType(Type t) { |
|
1028 |
return firstIncompatibleTypeArg(t) == null; |
|
1029 |
} |
|
1030 |
//WHERE |
|
1031 |
private Type firstIncompatibleTypeArg(Type type) { |
|
1032 |
List<Type> formals = type.tsym.type.allparams(); |
|
1033 |
List<Type> actuals = type.allparams(); |
|
1034 |
List<Type> args = type.getTypeArguments(); |
|
1035 |
List<Type> forms = type.tsym.type.getTypeArguments(); |
|
22163 | 1036 |
ListBuffer<Type> bounds_buf = new ListBuffer<>(); |
8037 | 1037 |
|
1038 |
// For matching pairs of actual argument types `a' and |
|
1039 |
// formal type parameters with declared bound `b' ... |
|
1040 |
while (args.nonEmpty() && forms.nonEmpty()) { |
|
1041 |
// exact type arguments needs to know their |
|
1042 |
// bounds (for upper and lower bound |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1043 |
// calculations). So we create new bounds where |
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1044 |
// 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
|
1045 |
bounds_buf.append(types.subst(forms.head.getUpperBound(), formals, actuals)); |
8037 | 1046 |
args = args.tail; |
1047 |
forms = forms.tail; |
|
1048 |
} |
|
1049 |
||
1050 |
args = type.getTypeArguments(); |
|
1051 |
List<Type> tvars_cap = types.substBounds(formals, |
|
1052 |
formals, |
|
1053 |
types.capture(type).allparams()); |
|
1054 |
while (args.nonEmpty() && tvars_cap.nonEmpty()) { |
|
1055 |
// Let the actual arguments know their bound |
|
1056 |
args.head.withTypeVar((TypeVar)tvars_cap.head); |
|
1057 |
args = args.tail; |
|
1058 |
tvars_cap = tvars_cap.tail; |
|
1059 |
} |
|
1060 |
||
1061 |
args = type.getTypeArguments(); |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1062 |
List<Type> bounds = bounds_buf.toList(); |
8037 | 1063 |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1064 |
while (args.nonEmpty() && bounds.nonEmpty()) { |
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1065 |
Type actual = args.head; |
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1066 |
if (!isTypeArgErroneous(actual) && |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1067 |
!bounds.head.isErroneous() && |
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1068 |
!checkExtends(actual, bounds.head)) { |
8037 | 1069 |
return args.head; |
1070 |
} |
|
1071 |
args = args.tail; |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1072 |
bounds = bounds.tail; |
8037 | 1073 |
} |
1074 |
||
1075 |
args = type.getTypeArguments(); |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1076 |
bounds = bounds_buf.toList(); |
8037 | 1077 |
|
1078 |
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
|
1079 |
if (arg.hasTag(TYPEVAR) && |
8044
7fd529d4472c
6943278: spurious error message for inference and type-variable with erroneous bound
mcimadamore
parents:
8037
diff
changeset
|
1080 |
arg.getUpperBound().isErroneous() && |
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1081 |
!bounds.head.isErroneous() && |
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1082 |
!isTypeArgErroneous(args.head)) { |
8037 | 1083 |
return args.head; |
1084 |
} |
|
12077
2038f4fe956e
7148242: Regression: valid code rejected during generic type well-formedness check
mcimadamore
parents:
11868
diff
changeset
|
1085 |
bounds = bounds.tail; |
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1086 |
args = args.tail; |
8037 | 1087 |
} |
1088 |
||
1089 |
return null; |
|
1090 |
} |
|
8238
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1091 |
//where |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1092 |
boolean isTypeArgErroneous(Type t) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1093 |
return isTypeArgErroneous.visit(t); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1094 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1095 |
|
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1096 |
Types.UnaryVisitor<Boolean> isTypeArgErroneous = new Types.UnaryVisitor<Boolean>() { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1097 |
public Boolean visitType(Type t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1098 |
return t.isErroneous(); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1099 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1100 |
@Override |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1101 |
public Boolean visitTypeVar(TypeVar t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1102 |
return visit(t.getUpperBound()); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1103 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1104 |
@Override |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1105 |
public Boolean visitCapturedType(CapturedType t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1106 |
return visit(t.getUpperBound()) || |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1107 |
visit(t.getLowerBound()); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1108 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1109 |
@Override |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1110 |
public Boolean visitWildcardType(WildcardType t, Void s) { |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1111 |
return visit(t.type); |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1112 |
} |
15ff254ff5c2
6969184: poor error recovery after symbol not found
mcimadamore
parents:
8237
diff
changeset
|
1113 |
}; |
8037 | 1114 |
|
10 | 1115 |
/** 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
|
1116 |
* return modifiers together with any implicit modifiers for that symbol. |
10 | 1117 |
* Warning: we can't use flags() here since this method |
1118 |
* is called during class enter, when flags() would cause a premature |
|
1119 |
* completion. |
|
1120 |
* @param pos Position to be used for error reporting. |
|
1121 |
* @param flags The set of modifiers given in a definition. |
|
1122 |
* @param sym The defined symbol. |
|
1123 |
*/ |
|
1124 |
long checkFlags(DiagnosticPosition pos, long flags, Symbol sym, JCTree tree) { |
|
1125 |
long mask; |
|
1126 |
long implicit = 0; |
|
19930
b6181c0049f3
8022322: Reject default and static methods in annotation
emc
parents:
19914
diff
changeset
|
1127 |
|
10 | 1128 |
switch (sym.kind) { |
1129 |
case VAR: |
|
24903
41e1812d6b4c
8027886: javac allows illegal receiver parameters
pgovereau
parents:
24902
diff
changeset
|
1130 |
if (TreeInfo.isReceiverParam(tree)) |
41e1812d6b4c
8027886: javac allows illegal receiver parameters
pgovereau
parents:
24902
diff
changeset
|
1131 |
mask = ReceiverParamFlags; |
41e1812d6b4c
8027886: javac allows illegal receiver parameters
pgovereau
parents:
24902
diff
changeset
|
1132 |
else if (sym.owner.kind != TYP) |
10 | 1133 |
mask = LocalVarFlags; |
1134 |
else if ((sym.owner.flags_field & INTERFACE) != 0) |
|
1135 |
mask = implicit = InterfaceVarFlags; |
|
1136 |
else |
|
1137 |
mask = VarFlags; |
|
1138 |
break; |
|
1139 |
case MTH: |
|
1140 |
if (sym.name == names.init) { |
|
1141 |
if ((sym.owner.flags_field & ENUM) != 0) { |
|
1142 |
// enum constructors cannot be declared public or |
|
1143 |
// protected and must be implicitly or explicitly |
|
1144 |
// private |
|
1145 |
implicit = PRIVATE; |
|
1146 |
mask = PRIVATE; |
|
1147 |
} else |
|
1148 |
mask = ConstructorFlags; |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1149 |
} else if ((sym.owner.flags_field & INTERFACE) != 0) { |
19930
b6181c0049f3
8022322: Reject default and static methods in annotation
emc
parents:
19914
diff
changeset
|
1150 |
if ((sym.owner.flags_field & ANNOTATION) != 0) { |
b6181c0049f3
8022322: Reject default and static methods in annotation
emc
parents:
19914
diff
changeset
|
1151 |
mask = AnnotationTypeElementMask; |
b6181c0049f3
8022322: Reject default and static methods in annotation
emc
parents:
19914
diff
changeset
|
1152 |
implicit = PUBLIC | ABSTRACT; |
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
29149
diff
changeset
|
1153 |
} else if ((flags & (DEFAULT | STATIC | PRIVATE)) != 0) { |
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1154 |
mask = InterfaceMethodMask; |
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
29149
diff
changeset
|
1155 |
implicit = (flags & PRIVATE) != 0 ? 0 : PUBLIC; |
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1156 |
if ((flags & DEFAULT) != 0) { |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1157 |
implicit |= ABSTRACT; |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1158 |
} |
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1159 |
} else { |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1160 |
mask = implicit = InterfaceMethodFlags; |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1161 |
} |
19930
b6181c0049f3
8022322: Reject default and static methods in annotation
emc
parents:
19914
diff
changeset
|
1162 |
} else { |
10 | 1163 |
mask = MethodFlags; |
1164 |
} |
|
1165 |
// Imply STRICTFP if owner has STRICTFP set. |
|
17281
7c38e715fd75
8012723: strictfp interface misses strictfp modifer on default method
vromero
parents:
16546
diff
changeset
|
1166 |
if (((flags|implicit) & Flags.ABSTRACT) == 0 || |
7c38e715fd75
8012723: strictfp interface misses strictfp modifer on default method
vromero
parents:
16546
diff
changeset
|
1167 |
((flags) & Flags.DEFAULT) != 0) |
15710
5792a085da41
7166455: javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
vromero
parents:
15705
diff
changeset
|
1168 |
implicit |= sym.owner.flags_field & STRICTFP; |
10 | 1169 |
break; |
1170 |
case TYP: |
|
1171 |
if (sym.isLocal()) { |
|
1172 |
mask = LocalClassFlags; |
|
1173 |
if ((sym.owner.flags_field & STATIC) == 0 && |
|
1174 |
(flags & ENUM) != 0) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1175 |
log.error(pos, Errors.EnumsMustBeStatic); |
10 | 1176 |
} else if (sym.owner.kind == TYP) { |
1177 |
mask = MemberClassFlags; |
|
1178 |
if (sym.owner.owner.kind == PCK || |
|
1179 |
(sym.owner.flags_field & STATIC) != 0) |
|
1180 |
mask |= STATIC; |
|
1181 |
else if ((flags & ENUM) != 0) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1182 |
log.error(pos, Errors.EnumsMustBeStatic); |
10 | 1183 |
// Nested interfaces and enums are always STATIC (Spec ???) |
1184 |
if ((flags & (INTERFACE | ENUM)) != 0 ) implicit = STATIC; |
|
1185 |
} else { |
|
1186 |
mask = ClassFlags; |
|
1187 |
} |
|
1188 |
// Interfaces are always ABSTRACT |
|
1189 |
if ((flags & INTERFACE) != 0) implicit |= ABSTRACT; |
|
1190 |
||
1191 |
if ((flags & ENUM) != 0) { |
|
1192 |
// enums can't be declared abstract or final |
|
1193 |
mask &= ~(ABSTRACT | FINAL); |
|
1194 |
implicit |= implicitEnumFinalFlag(tree); |
|
1195 |
} |
|
1196 |
// Imply STRICTFP if owner has STRICTFP set. |
|
1197 |
implicit |= sym.owner.flags_field & STRICTFP; |
|
1198 |
break; |
|
1199 |
default: |
|
1200 |
throw new AssertionError(); |
|
1201 |
} |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1202 |
long illegal = flags & ExtendedStandardFlags & ~mask; |
10 | 1203 |
if (illegal != 0) { |
1204 |
if ((illegal & INTERFACE) != 0) { |
|
45867
ca77ebd05a06
8074364: Update error message for incorrect annotation type declaration
pmuthuswamy
parents:
45758
diff
changeset
|
1205 |
log.error(pos, ((flags & ANNOTATION) != 0) ? Errors.AnnotationDeclNotAllowedHere : Errors.IntfNotAllowedHere); |
10 | 1206 |
mask |= INTERFACE; |
1207 |
} |
|
1208 |
else { |
|
1209 |
log.error(pos, |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1210 |
Errors.ModNotAllowedHere(asFlagSet(illegal))); |
10 | 1211 |
} |
1212 |
} |
|
1213 |
else if ((sym.kind == TYP || |
|
1214 |
// ISSUE: Disallowing abstract&private is no longer appropriate |
|
1215 |
// in the presence of inner classes. Should it be deleted here? |
|
1216 |
checkDisjoint(pos, flags, |
|
1217 |
ABSTRACT, |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1218 |
PRIVATE | STATIC | DEFAULT)) |
10 | 1219 |
&& |
1220 |
checkDisjoint(pos, flags, |
|
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
29149
diff
changeset
|
1221 |
STATIC | PRIVATE, |
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1222 |
DEFAULT) |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1223 |
&& |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15374
diff
changeset
|
1224 |
checkDisjoint(pos, flags, |
10 | 1225 |
ABSTRACT | INTERFACE, |
1226 |
FINAL | NATIVE | SYNCHRONIZED) |
|
1227 |
&& |
|
1228 |
checkDisjoint(pos, flags, |
|
1229 |
PUBLIC, |
|
1230 |
PRIVATE | PROTECTED) |
|
1231 |
&& |
|
1232 |
checkDisjoint(pos, flags, |
|
1233 |
PRIVATE, |
|
1234 |
PUBLIC | PROTECTED) |
|
1235 |
&& |
|
1236 |
checkDisjoint(pos, flags, |
|
1237 |
FINAL, |
|
1238 |
VOLATILE) |
|
1239 |
&& |
|
1240 |
(sym.kind == TYP || |
|
1241 |
checkDisjoint(pos, flags, |
|
1242 |
ABSTRACT | NATIVE, |
|
1243 |
STRICTFP))) { |
|
1244 |
// skip |
|
1245 |
} |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14259
diff
changeset
|
1246 |
return flags & (mask | ~ExtendedStandardFlags) | implicit; |
10 | 1247 |
} |
1248 |
||
1249 |
||
1250 |
/** Determine if this enum should be implicitly final. |
|
1251 |
* |
|
1252 |
* If the enum has no specialized enum contants, it is final. |
|
1253 |
* |
|
1254 |
* If the enum does have specialized enum contants, it is |
|
1255 |
* <i>not</i> final. |
|
1256 |
*/ |
|
1257 |
private long implicitEnumFinalFlag(JCTree tree) { |
|
10950 | 1258 |
if (!tree.hasTag(CLASSDEF)) return 0; |
10 | 1259 |
class SpecialTreeVisitor extends JCTree.Visitor { |
1260 |
boolean specialized; |
|
1261 |
SpecialTreeVisitor() { |
|
1262 |
this.specialized = false; |
|
22163 | 1263 |
} |
10 | 1264 |
|
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1265 |
@Override |
10 | 1266 |
public void visitTree(JCTree tree) { /* no-op */ } |
1267 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1268 |
@Override |
10 | 1269 |
public void visitVarDef(JCVariableDecl tree) { |
1270 |
if ((tree.mods.flags & ENUM) != 0) { |
|
1271 |
if (tree.init instanceof JCNewClass && |
|
1272 |
((JCNewClass) tree.init).def != null) { |
|
1273 |
specialized = true; |
|
1274 |
} |
|
1275 |
} |
|
1276 |
} |
|
1277 |
} |
|
1278 |
||
1279 |
SpecialTreeVisitor sts = new SpecialTreeVisitor(); |
|
1280 |
JCClassDecl cdef = (JCClassDecl) tree; |
|
1281 |
for (JCTree defs: cdef.defs) { |
|
1282 |
defs.accept(sts); |
|
1283 |
if (sts.specialized) return 0; |
|
1284 |
} |
|
1285 |
return FINAL; |
|
1286 |
} |
|
1287 |
||
1288 |
/* ************************************************************************* |
|
1289 |
* Type Validation |
|
1290 |
**************************************************************************/ |
|
1291 |
||
1292 |
/** Validate a type expression. That is, |
|
1293 |
* check that all type arguments of a parametric type are within |
|
17578 | 1294 |
* their bounds. This must be done in a second phase after type attribution |
10 | 1295 |
* since a class might have a subclass as type parameter bound. E.g: |
1296 |
* |
|
14259 | 1297 |
* <pre>{@code |
10 | 1298 |
* class B<A extends C> { ... } |
1299 |
* class C extends B<C> { ... } |
|
14259 | 1300 |
* }</pre> |
10 | 1301 |
* |
1302 |
* and we can't make sure that the bound is already attributed because |
|
1303 |
* of possible cycles. |
|
6351 | 1304 |
* |
1305 |
* Visitor method: Validate a type expression, if it is not null, catching |
|
10 | 1306 |
* and reporting any completion failures. |
1307 |
*/ |
|
1358 | 1308 |
void validate(JCTree tree, Env<AttrContext> env) { |
6351 | 1309 |
validate(tree, env, true); |
10 | 1310 |
} |
6351 | 1311 |
void validate(JCTree tree, Env<AttrContext> env, boolean checkRaw) { |
1312 |
new Validator(env).validateTree(tree, checkRaw, true); |
|
1358 | 1313 |
} |
10 | 1314 |
|
1315 |
/** Visitor method: Validate a list of type expressions. |
|
1316 |
*/ |
|
1358 | 1317 |
void validate(List<? extends JCTree> trees, Env<AttrContext> env) { |
10 | 1318 |
for (List<? extends JCTree> l = trees; l.nonEmpty(); l = l.tail) |
1358 | 1319 |
validate(l.head, env); |
10 | 1320 |
} |
1321 |
||
1322 |
/** A visitor class for type validation. |
|
1323 |
*/ |
|
1324 |
class Validator extends JCTree.Visitor { |
|
1325 |
||
20240
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1326 |
boolean checkRaw; |
6351 | 1327 |
boolean isOuter; |
1328 |
Env<AttrContext> env; |
|
1329 |
||
1330 |
Validator(Env<AttrContext> env) { |
|
1331 |
this.env = env; |
|
1332 |
} |
|
1333 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1334 |
@Override |
10 | 1335 |
public void visitTypeArray(JCArrayTypeTree tree) { |
20240
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1336 |
validateTree(tree.elemtype, checkRaw, isOuter); |
10 | 1337 |
} |
1338 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1339 |
@Override |
10 | 1340 |
public void visitTypeApply(JCTypeApply tree) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1341 |
if (tree.type.hasTag(CLASS)) { |
10 | 1342 |
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
|
1343 |
List<Type> forms = tree.type.tsym.type.getTypeArguments(); |
8037 | 1344 |
|
1345 |
Type incompatibleArg = firstIncompatibleTypeArg(tree.type); |
|
1346 |
if (incompatibleArg != null) { |
|
1347 |
for (JCTree arg : tree.arguments) { |
|
1348 |
if (arg.type == incompatibleArg) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1349 |
log.error(arg, Errors.NotWithinBounds(incompatibleArg, forms.head)); |
8037 | 1350 |
} |
8045 | 1351 |
forms = forms.tail; |
1352 |
} |
|
1353 |
} |
|
1354 |
||
1355 |
forms = tree.type.tsym.type.getTypeArguments(); |
|
10 | 1356 |
|
6351 | 1357 |
boolean is_java_lang_Class = tree.type.tsym.flatName() == names.java_lang_Class; |
1358 |
||
10 | 1359 |
// For matching pairs of actual argument types `a' and |
1360 |
// formal type parameters with declared bound `b' ... |
|
1361 |
while (args.nonEmpty() && forms.nonEmpty()) { |
|
6351 | 1362 |
validateTree(args.head, |
1363 |
!(isOuter && is_java_lang_Class), |
|
1364 |
false); |
|
10 | 1365 |
args = args.tail; |
1366 |
forms = forms.tail; |
|
1367 |
} |
|
1368 |
||
1369 |
// Check that this type is either fully parameterized, or |
|
1370 |
// not parameterized at all. |
|
1371 |
if (tree.type.getEnclosingType().isRaw()) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1372 |
log.error(tree.pos(), Errors.ImproperlyFormedTypeInnerRawParam); |
10950 | 1373 |
if (tree.clazz.hasTag(SELECT)) |
10 | 1374 |
visitSelectInternal((JCFieldAccess)tree.clazz); |
1375 |
} |
|
1376 |
} |
|
1377 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1378 |
@Override |
10 | 1379 |
public void visitTypeParameter(JCTypeParameter tree) { |
6351 | 1380 |
validateTrees(tree.bounds, true, isOuter); |
10 | 1381 |
checkClassBounds(tree.pos(), tree.type); |
1382 |
} |
|
1383 |
||
1384 |
@Override |
|
1385 |
public void visitWildcard(JCWildcard tree) { |
|
1386 |
if (tree.inner != null) |
|
6351 | 1387 |
validateTree(tree.inner, true, isOuter); |
10 | 1388 |
} |
1389 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1390 |
@Override |
10 | 1391 |
public void visitSelect(JCFieldAccess tree) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1392 |
if (tree.type.hasTag(CLASS)) { |
10 | 1393 |
visitSelectInternal(tree); |
1394 |
||
1395 |
// Check that this type is either fully parameterized, or |
|
1396 |
// not parameterized at all. |
|
1397 |
if (tree.selected.type.isParameterized() && tree.type.tsym.type.getTypeArguments().nonEmpty()) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1398 |
log.error(tree.pos(), Errors.ImproperlyFormedTypeParamMissing); |
10 | 1399 |
} |
1400 |
} |
|
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
1401 |
|
10 | 1402 |
public void visitSelectInternal(JCFieldAccess tree) { |
1358 | 1403 |
if (tree.type.tsym.isStatic() && |
10 | 1404 |
tree.selected.type.isParameterized()) { |
1405 |
// The enclosing type is not a class, so we are |
|
1406 |
// looking at a static member type. However, the |
|
1407 |
// qualifying expression is parameterized. |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1408 |
log.error(tree.pos(), Errors.CantSelectStaticClassFromParamType); |
10 | 1409 |
} else { |
1410 |
// otherwise validate the rest of the expression |
|
1358 | 1411 |
tree.selected.accept(this); |
10 | 1412 |
} |
1413 |
} |
|
1414 |
||
15385 | 1415 |
@Override |
1416 |
public void visitAnnotatedType(JCAnnotatedType tree) { |
|
1417 |
tree.underlyingType.accept(this); |
|
1418 |
} |
|
1419 |
||
21896
f39003ba351f
8026374: javac accepts void as a method parameter
jlahoda
parents:
21712
diff
changeset
|
1420 |
@Override |
f39003ba351f
8026374: javac accepts void as a method parameter
jlahoda
parents:
21712
diff
changeset
|
1421 |
public void visitTypeIdent(JCPrimitiveTypeTree that) { |
f39003ba351f
8026374: javac accepts void as a method parameter
jlahoda
parents:
21712
diff
changeset
|
1422 |
if (that.type.hasTag(TypeTag.VOID)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1423 |
log.error(that.pos(), Errors.VoidNotAllowedHere); |
21896
f39003ba351f
8026374: javac accepts void as a method parameter
jlahoda
parents:
21712
diff
changeset
|
1424 |
} |
f39003ba351f
8026374: javac accepts void as a method parameter
jlahoda
parents:
21712
diff
changeset
|
1425 |
super.visitTypeIdent(that); |
f39003ba351f
8026374: javac accepts void as a method parameter
jlahoda
parents:
21712
diff
changeset
|
1426 |
} |
f39003ba351f
8026374: javac accepts void as a method parameter
jlahoda
parents:
21712
diff
changeset
|
1427 |
|
10 | 1428 |
/** Default visitor method: do nothing. |
1429 |
*/ |
|
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
1430 |
@Override |
10 | 1431 |
public void visitTree(JCTree tree) { |
1432 |
} |
|
1358 | 1433 |
|
6351 | 1434 |
public void validateTree(JCTree tree, boolean checkRaw, boolean isOuter) { |
20240
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1435 |
if (tree != null) { |
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1436 |
boolean prevCheckRaw = this.checkRaw; |
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1437 |
this.checkRaw = checkRaw; |
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1438 |
this.isOuter = isOuter; |
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1439 |
|
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1440 |
try { |
6351 | 1441 |
tree.accept(this); |
1442 |
if (checkRaw) |
|
1443 |
checkRaw(tree, env); |
|
20240
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1444 |
} catch (CompletionFailure ex) { |
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1445 |
completionError(tree.pos(), ex); |
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1446 |
} finally { |
1818352eef49
8022567: Javac Should Generate Warnings For Raw Array Type
jlahoda
parents:
19942
diff
changeset
|
1447 |
this.checkRaw = prevCheckRaw; |
6351 | 1448 |
} |
1449 |
} |
|
1450 |
} |
|
1451 |
||
1452 |
public void validateTrees(List<? extends JCTree> trees, boolean checkRaw, boolean isOuter) { |
|
1453 |
for (List<? extends JCTree> l = trees; l.nonEmpty(); l = l.tail) |
|
1454 |
validateTree(l.head, checkRaw, isOuter); |
|
1455 |
} |
|
17583
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1456 |
} |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1457 |
|
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1458 |
void checkRaw(JCTree tree, Env<AttrContext> env) { |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1459 |
if (lint.isEnabled(LintCategory.RAW) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1460 |
tree.type.hasTag(CLASS) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1461 |
!TreeInfo.isDiamond(tree) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1462 |
!withinAnonConstr(env) && |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1463 |
tree.type.isRaw()) { |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1464 |
log.warning(LintCategory.RAW, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1465 |
tree.pos(), Warnings.RawClassUse(tree.type, tree.type.tsym.type)); |
6351 | 1466 |
} |
17583
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1467 |
} |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1468 |
//where |
91949b5f7651
8012685: Spurious raw types warning when using unbound method references
mcimadamore
parents:
17578
diff
changeset
|
1469 |
private boolean withinAnonConstr(Env<AttrContext> env) { |
10721
ca322e50ddb7
7090499: missing rawtypes warnings in anonymous inner class
mcimadamore
parents:
10626
diff
changeset
|
1470 |
return env.enclClass.name.isEmpty() && |
ca322e50ddb7
7090499: missing rawtypes warnings in anonymous inner class
mcimadamore
parents:
10626
diff
changeset
|
1471 |
env.enclMethod != null && env.enclMethod.name == names.init; |
ca322e50ddb7
7090499: missing rawtypes warnings in anonymous inner class
mcimadamore
parents:
10626
diff
changeset
|
1472 |
} |
10 | 1473 |
|
1474 |
/* ************************************************************************* |
|
1475 |
* Exception checking |
|
1476 |
**************************************************************************/ |
|
1477 |
||
1478 |
/* The following methods treat classes as sets that contain |
|
1479 |
* the class itself and all their subclasses |
|
1480 |
*/ |
|
1481 |
||
1482 |
/** Is given type a subtype of some of the types in given list? |
|
1483 |
*/ |
|
1484 |
boolean subset(Type t, List<Type> ts) { |
|
1485 |
for (List<Type> l = ts; l.nonEmpty(); l = l.tail) |
|
1486 |
if (types.isSubtype(t, l.head)) return true; |
|
1487 |
return false; |
|
1488 |
} |
|
1489 |
||
1490 |
/** Is given type a subtype or supertype of |
|
1491 |
* some of the types in given list? |
|
1492 |
*/ |
|
1493 |
boolean intersects(Type t, List<Type> ts) { |
|
1494 |
for (List<Type> l = ts; l.nonEmpty(); l = l.tail) |
|
1495 |
if (types.isSubtype(t, l.head) || types.isSubtype(l.head, t)) return true; |
|
1496 |
return false; |
|
1497 |
} |
|
1498 |
||
1499 |
/** Add type set to given type list, unless it is a subclass of some class |
|
1500 |
* in the list. |
|
1501 |
*/ |
|
1502 |
List<Type> incl(Type t, List<Type> ts) { |
|
1503 |
return subset(t, ts) ? ts : excl(t, ts).prepend(t); |
|
1504 |
} |
|
1505 |
||
1506 |
/** Remove type set from type set list. |
|
1507 |
*/ |
|
1508 |
List<Type> excl(Type t, List<Type> ts) { |
|
1509 |
if (ts.isEmpty()) { |
|
1510 |
return ts; |
|
1511 |
} else { |
|
1512 |
List<Type> ts1 = excl(t, ts.tail); |
|
1513 |
if (types.isSubtype(ts.head, t)) return ts1; |
|
1514 |
else if (ts1 == ts.tail) return ts; |
|
1515 |
else return ts1.prepend(ts.head); |
|
1516 |
} |
|
1517 |
} |
|
1518 |
||
1519 |
/** Form the union of two type set lists. |
|
1520 |
*/ |
|
1521 |
List<Type> union(List<Type> ts1, List<Type> ts2) { |
|
1522 |
List<Type> ts = ts1; |
|
1523 |
for (List<Type> l = ts2; l.nonEmpty(); l = l.tail) |
|
1524 |
ts = incl(l.head, ts); |
|
1525 |
return ts; |
|
1526 |
} |
|
1527 |
||
1528 |
/** Form the difference of two type lists. |
|
1529 |
*/ |
|
1530 |
List<Type> diff(List<Type> ts1, List<Type> ts2) { |
|
1531 |
List<Type> ts = ts1; |
|
1532 |
for (List<Type> l = ts2; l.nonEmpty(); l = l.tail) |
|
1533 |
ts = excl(l.head, ts); |
|
1534 |
return ts; |
|
1535 |
} |
|
1536 |
||
1537 |
/** Form the intersection of two type lists. |
|
1538 |
*/ |
|
1539 |
public List<Type> intersect(List<Type> ts1, List<Type> ts2) { |
|
1540 |
List<Type> ts = List.nil(); |
|
1541 |
for (List<Type> l = ts1; l.nonEmpty(); l = l.tail) |
|
1542 |
if (subset(l.head, ts2)) ts = incl(l.head, ts); |
|
1543 |
for (List<Type> l = ts2; l.nonEmpty(); l = l.tail) |
|
1544 |
if (subset(l.head, ts1)) ts = incl(l.head, ts); |
|
1545 |
return ts; |
|
1546 |
} |
|
1547 |
||
1548 |
/** Is exc an exception symbol that need not be declared? |
|
1549 |
*/ |
|
1550 |
boolean isUnchecked(ClassSymbol exc) { |
|
1551 |
return |
|
1552 |
exc.kind == ERR || |
|
1553 |
exc.isSubClass(syms.errorType.tsym, types) || |
|
1554 |
exc.isSubClass(syms.runtimeExceptionType.tsym, types); |
|
1555 |
} |
|
1556 |
||
1557 |
/** Is exc an exception type that need not be declared? |
|
1558 |
*/ |
|
1559 |
boolean isUnchecked(Type exc) { |
|
1560 |
return |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1561 |
(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
|
1562 |
(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
|
1563 |
exc.hasTag(BOT); |
10 | 1564 |
} |
1565 |
||
45756
67f4f8f4d34a
8182047: javac compile error on type-parameter-exceptions in lambda expressions
vromero
parents:
45504
diff
changeset
|
1566 |
boolean isChecked(Type exc) { |
67f4f8f4d34a
8182047: javac compile error on type-parameter-exceptions in lambda expressions
vromero
parents:
45504
diff
changeset
|
1567 |
return !isUnchecked(exc); |
67f4f8f4d34a
8182047: javac compile error on type-parameter-exceptions in lambda expressions
vromero
parents:
45504
diff
changeset
|
1568 |
} |
67f4f8f4d34a
8182047: javac compile error on type-parameter-exceptions in lambda expressions
vromero
parents:
45504
diff
changeset
|
1569 |
|
10 | 1570 |
/** Same, but handling completion failures. |
1571 |
*/ |
|
1572 |
boolean isUnchecked(DiagnosticPosition pos, Type exc) { |
|
1573 |
try { |
|
1574 |
return isUnchecked(exc); |
|
1575 |
} catch (CompletionFailure ex) { |
|
1576 |
completionError(pos, ex); |
|
1577 |
return true; |
|
1578 |
} |
|
1579 |
} |
|
1580 |
||
1581 |
/** Is exc handled by given exception list? |
|
1582 |
*/ |
|
1583 |
boolean isHandled(Type exc, List<Type> handled) { |
|
1584 |
return isUnchecked(exc) || subset(exc, handled); |
|
1585 |
} |
|
1586 |
||
1587 |
/** Return all exceptions in thrown list that are not in handled list. |
|
1588 |
* @param thrown The list of thrown exceptions. |
|
1589 |
* @param handled The list of handled exceptions. |
|
1590 |
*/ |
|
3560 | 1591 |
List<Type> unhandled(List<Type> thrown, List<Type> handled) { |
10 | 1592 |
List<Type> unhandled = List.nil(); |
1593 |
for (List<Type> l = thrown; l.nonEmpty(); l = l.tail) |
|
1594 |
if (!isHandled(l.head, handled)) unhandled = unhandled.prepend(l.head); |
|
1595 |
return unhandled; |
|
1596 |
} |
|
1597 |
||
1598 |
/* ************************************************************************* |
|
1599 |
* Overriding/Implementation checking |
|
1600 |
**************************************************************************/ |
|
1601 |
||
1602 |
/** The level of access protection given by a flag set, |
|
1603 |
* where PRIVATE is highest and PUBLIC is lowest. |
|
1604 |
*/ |
|
1605 |
static int protection(long flags) { |
|
1606 |
switch ((short)(flags & AccessFlags)) { |
|
1607 |
case PRIVATE: return 3; |
|
1608 |
case PROTECTED: return 1; |
|
1609 |
default: |
|
1610 |
case PUBLIC: return 0; |
|
1611 |
case 0: return 2; |
|
1612 |
} |
|
1613 |
} |
|
1614 |
||
1615 |
/** A customized "cannot override" error message. |
|
1616 |
* @param m The overriding method. |
|
1617 |
* @param other The overridden method. |
|
1618 |
* @return An internationalized string. |
|
1619 |
*/ |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1620 |
Fragment cannotOverride(MethodSymbol m, MethodSymbol other) { |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1621 |
Symbol mloc = m.location(); |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1622 |
Symbol oloc = other.location(); |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1623 |
|
10 | 1624 |
if ((other.owner.flags() & INTERFACE) == 0) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1625 |
return Fragments.CantOverride(m, mloc, other, oloc); |
10 | 1626 |
else if ((m.owner.flags() & INTERFACE) == 0) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1627 |
return Fragments.CantImplement(m, mloc, other, oloc); |
10 | 1628 |
else |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1629 |
return Fragments.ClashesWith(m, mloc, other, oloc); |
10 | 1630 |
} |
1631 |
||
1632 |
/** A customized "override" warning message. |
|
1633 |
* @param m The overriding method. |
|
1634 |
* @param other The overridden method. |
|
1635 |
* @return An internationalized string. |
|
1636 |
*/ |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1637 |
Fragment uncheckedOverrides(MethodSymbol m, MethodSymbol other) { |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1638 |
Symbol mloc = m.location(); |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1639 |
Symbol oloc = other.location(); |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1640 |
|
10 | 1641 |
if ((other.owner.flags() & INTERFACE) == 0) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1642 |
return Fragments.UncheckedOverride(m, mloc, other, oloc); |
10 | 1643 |
else if ((m.owner.flags() & INTERFACE) == 0) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1644 |
return Fragments.UncheckedImplement(m, mloc, other, oloc); |
10 | 1645 |
else |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1646 |
return Fragments.UncheckedClashWith(m, mloc, other, oloc); |
10 | 1647 |
} |
1648 |
||
1649 |
/** A customized "override" warning message. |
|
1650 |
* @param m The overriding method. |
|
1651 |
* @param other The overridden method. |
|
1652 |
* @return An internationalized string. |
|
1653 |
*/ |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1654 |
Fragment varargsOverrides(MethodSymbol m, MethodSymbol other) { |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1655 |
Symbol mloc = m.location(); |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1656 |
Symbol oloc = other.location(); |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1657 |
|
10 | 1658 |
if ((other.owner.flags() & INTERFACE) == 0) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1659 |
return Fragments.VarargsOverride(m, mloc, other, oloc); |
10 | 1660 |
else if ((m.owner.flags() & INTERFACE) == 0) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1661 |
return Fragments.VarargsImplement(m, mloc, other, oloc); |
10 | 1662 |
else |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1663 |
return Fragments.VarargsClashWith(m, mloc, other, oloc); |
10 | 1664 |
} |
1665 |
||
1666 |
/** Check that this method conforms with overridden method 'other'. |
|
1667 |
* where `origin' is the class where checking started. |
|
1668 |
* Complications: |
|
1669 |
* (1) Do not check overriding of synthetic methods |
|
1670 |
* (reason: they might be final). |
|
1671 |
* todo: check whether this is still necessary. |
|
1672 |
* (2) Admit the case where an interface proxy throws fewer exceptions |
|
1673 |
* than the method it implements. Augment the proxy methods with the |
|
1674 |
* undeclared exceptions in this case. |
|
1675 |
* (3) When generics are enabled, admit the case where an interface proxy |
|
1676 |
* has a result type |
|
1677 |
* extended by the result type of the method it implements. |
|
1678 |
* Change the proxies result type to the smaller type in this case. |
|
1679 |
* |
|
1680 |
* @param tree The tree from which positions |
|
1681 |
* are extracted for errors. |
|
1682 |
* @param m The overriding method. |
|
1683 |
* @param other The overridden method. |
|
1684 |
* @param origin The class of which the overriding method |
|
1685 |
* is a member. |
|
1686 |
*/ |
|
1687 |
void checkOverride(JCTree tree, |
|
1688 |
MethodSymbol m, |
|
1689 |
MethodSymbol other, |
|
1690 |
ClassSymbol origin) { |
|
1691 |
// Don't check overriding of synthetic methods or by bridge methods. |
|
1692 |
if ((m.flags() & (SYNTHETIC|BRIDGE)) != 0 || (other.flags() & SYNTHETIC) != 0) { |
|
1693 |
return; |
|
1694 |
} |
|
1695 |
||
1696 |
// Error if static method overrides instance method (JLS 8.4.6.2). |
|
1697 |
if ((m.flags() & STATIC) != 0 && |
|
1698 |
(other.flags() & STATIC) == 0) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1699 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1700 |
Errors.OverrideStatic(cannotOverride(m, other))); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1701 |
m.flags_field |= BAD_OVERRIDE; |
10 | 1702 |
return; |
1703 |
} |
|
1704 |
||
1705 |
// Error if instance method overrides static or final |
|
1706 |
// method (JLS 8.4.6.1). |
|
1707 |
if ((other.flags() & FINAL) != 0 || |
|
1708 |
(m.flags() & STATIC) == 0 && |
|
1709 |
(other.flags() & STATIC) != 0) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1710 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1711 |
Errors.OverrideMeth(cannotOverride(m, other), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1712 |
asFlagSet(other.flags() & (FINAL | STATIC)))); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1713 |
m.flags_field |= BAD_OVERRIDE; |
10 | 1714 |
return; |
1715 |
} |
|
1716 |
||
1717 |
if ((m.owner.flags() & ANNOTATION) != 0) { |
|
1718 |
// handled in validateAnnotationMethod |
|
1719 |
return; |
|
1720 |
} |
|
1721 |
||
1722 |
// Error if overriding method has weaker access (JLS 8.4.6.3). |
|
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
29149
diff
changeset
|
1723 |
if (protection(m.flags()) > protection(other.flags())) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1724 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
23796 | 1725 |
(other.flags() & AccessFlags) == 0 ? |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1726 |
Errors.OverrideWeakerAccess(cannotOverride(m, other), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1727 |
"package") : |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1728 |
Errors.OverrideWeakerAccess(cannotOverride(m, other), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1729 |
asFlagSet(other.flags() & AccessFlags))); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1730 |
m.flags_field |= BAD_OVERRIDE; |
10 | 1731 |
return; |
1732 |
} |
|
1733 |
||
1734 |
Type mt = types.memberType(origin.type, m); |
|
1735 |
Type ot = types.memberType(origin.type, other); |
|
1736 |
// Error if overriding result type is different |
|
1737 |
// (or, in the case of generics mode, not a subtype) of |
|
1738 |
// overridden result type. We have to rename any type parameters |
|
1739 |
// before comparing types. |
|
1740 |
List<Type> mtvars = mt.getTypeArguments(); |
|
1741 |
List<Type> otvars = ot.getTypeArguments(); |
|
1742 |
Type mtres = mt.getReturnType(); |
|
1743 |
Type otres = types.subst(ot.getReturnType(), otvars, mtvars); |
|
1744 |
||
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
1745 |
overrideWarner.clear(); |
10 | 1746 |
boolean resultTypesOK = |
1874 | 1747 |
types.returnTypeSubstitutable(mt, ot, otres, overrideWarner); |
10 | 1748 |
if (!resultTypesOK) { |
33713
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1749 |
if ((m.flags() & STATIC) != 0 && (other.flags() & STATIC) != 0) { |
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1750 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1751 |
Errors.OverrideIncompatibleRet(Fragments.CantHide(m, m.location(), other, |
33713
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1752 |
other.location()), mtres, otres)); |
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1753 |
m.flags_field |= BAD_OVERRIDE; |
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1754 |
} else { |
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1755 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1756 |
Errors.OverrideIncompatibleRet(cannotOverride(m, other), mtres, otres)); |
33713
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1757 |
m.flags_field |= BAD_OVERRIDE; |
dc1d2632935c
8139255: javac reports "cannot override" messages instead of "cannot hide" messages for static methods
sadayapalam
parents:
33709
diff
changeset
|
1758 |
} |
25445
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
1759 |
return; |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
1760 |
} else if (overrideWarner.hasNonSilentLint(LintCategory.UNCHECKED)) { |
10 | 1761 |
warnUnchecked(TreeInfo.diagnosticPositionFor(m, tree), |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
1762 |
Warnings.OverrideUncheckedRet(uncheckedOverrides(m, other), mtres, otres)); |
10 | 1763 |
} |
1764 |
||
1765 |
// Error if overriding method throws an exception not reported |
|
1766 |
// by overridden method. |
|
1767 |
List<Type> otthrown = types.subst(ot.getThrownTypes(), otvars, mtvars); |
|
3560 | 1768 |
List<Type> unhandledErased = unhandled(mt.getThrownTypes(), types.erasure(otthrown)); |
1769 |
List<Type> unhandledUnerased = unhandled(mt.getThrownTypes(), otthrown); |
|
1770 |
if (unhandledErased.nonEmpty()) { |
|
10 | 1771 |
log.error(TreeInfo.diagnosticPositionFor(m, tree), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1772 |
Errors.OverrideMethDoesntThrow(cannotOverride(m, other), unhandledUnerased.head)); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
1773 |
m.flags_field |= BAD_OVERRIDE; |
3560 | 1774 |
return; |
1775 |
} |
|
1776 |
else if (unhandledUnerased.nonEmpty()) { |
|
1777 |
warnUnchecked(TreeInfo.diagnosticPositionFor(m, tree), |
|
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
1778 |
Warnings.OverrideUncheckedThrown(cannotOverride(m, other), unhandledUnerased.head)); |
10 | 1779 |
return; |
1780 |
} |
|
1781 |
||
1782 |
// Optional warning if varargs don't agree |
|
1783 |
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
|
1784 |
&& lint.isEnabled(LintCategory.OVERRIDES)) { |
10 | 1785 |
log.warning(TreeInfo.diagnosticPositionFor(m, tree), |
1786 |
((m.flags() & Flags.VARARGS) != 0) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1787 |
? Warnings.OverrideVarargsMissing(varargsOverrides(m, other)) |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1788 |
: Warnings.OverrideVarargsExtra(varargsOverrides(m, other))); |
10 | 1789 |
} |
1790 |
||
1791 |
// Warn if instance method overrides bridge method (compiler spec ??) |
|
1792 |
if ((other.flags() & BRIDGE) != 0) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1793 |
log.warning(TreeInfo.diagnosticPositionFor(m, tree), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1794 |
Warnings.OverrideBridge(uncheckedOverrides(m, other))); |
10 | 1795 |
} |
1796 |
||
1797 |
// 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
|
1798 |
if (!isDeprecatedOverrideIgnorable(other, origin)) { |
23111
ef4562cfb234
8033421: @SuppressWarnings("deprecation") does not work when overriding deprecated method
jlahoda
parents:
22688
diff
changeset
|
1799 |
Lint prevLint = setLint(lint.augment(m)); |
ef4562cfb234
8033421: @SuppressWarnings("deprecation") does not work when overriding deprecated method
jlahoda
parents:
22688
diff
changeset
|
1800 |
try { |
53037
e84983c2735e
8215368: Make Check.checkOverride call diagnosticPositionFor lazily
cushon
parents:
52777
diff
changeset
|
1801 |
checkDeprecated(() -> TreeInfo.diagnosticPositionFor(m, tree), m, other); |
23111
ef4562cfb234
8033421: @SuppressWarnings("deprecation") does not work when overriding deprecated method
jlahoda
parents:
22688
diff
changeset
|
1802 |
} finally { |
ef4562cfb234
8033421: @SuppressWarnings("deprecation") does not work when overriding deprecated method
jlahoda
parents:
22688
diff
changeset
|
1803 |
setLint(prevLint); |
ef4562cfb234
8033421: @SuppressWarnings("deprecation") does not work when overriding deprecated method
jlahoda
parents:
22688
diff
changeset
|
1804 |
} |
10 | 1805 |
} |
1806 |
} |
|
1807 |
// where |
|
1808 |
private boolean isDeprecatedOverrideIgnorable(MethodSymbol m, ClassSymbol origin) { |
|
1809 |
// If the method, m, is defined in an interface, then ignore the issue if the method |
|
1810 |
// is only inherited via a supertype and also implemented in the supertype, |
|
1811 |
// because in that case, we will rediscover the issue when examining the method |
|
1812 |
// in the supertype. |
|
1813 |
// If the method, m, is not defined in an interface, then the only time we need to |
|
1814 |
// address the issue is when the method is the supertype implemementation: any other |
|
1815 |
// case, we will have dealt with when examining the supertype classes |
|
1816 |
ClassSymbol mc = m.enclClass(); |
|
1817 |
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
|
1818 |
if (!st.hasTag(CLASS)) |
10 | 1819 |
return true; |
1820 |
MethodSymbol stimpl = m.implementation((ClassSymbol)st.tsym, types, false); |
|
1821 |
||
1822 |
if (mc != null && ((mc.flags() & INTERFACE) != 0)) { |
|
1823 |
List<Type> intfs = types.interfaces(origin.type); |
|
1824 |
return (intfs.contains(mc.type) ? false : (stimpl != null)); |
|
1825 |
} |
|
1826 |
else |
|
1827 |
return (stimpl != m); |
|
1828 |
} |
|
1829 |
||
1830 |
||
1831 |
// used to check if there were any unchecked conversions |
|
1832 |
Warner overrideWarner = new Warner(); |
|
1833 |
||
1834 |
/** Check that a class does not inherit two concrete methods |
|
1835 |
* with the same signature. |
|
1836 |
* @param pos Position to be used for error reporting. |
|
1837 |
* @param site The class type to be checked. |
|
1838 |
*/ |
|
1839 |
public void checkCompatibleConcretes(DiagnosticPosition pos, Type site) { |
|
1840 |
Type sup = types.supertype(site); |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1841 |
if (!sup.hasTag(CLASS)) return; |
10 | 1842 |
|
1843 |
for (Type t1 = sup; |
|
19503
58688e470d3b
8022508: javac crashes if the generics arity of a base class is wrong
jlahoda
parents:
19492
diff
changeset
|
1844 |
t1.hasTag(CLASS) && t1.tsym.type.isParameterized(); |
10 | 1845 |
t1 = types.supertype(t1)) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
1846 |
for (Symbol s1 : t1.tsym.members().getSymbols(NON_RECURSIVE)) { |
10 | 1847 |
if (s1.kind != MTH || |
1848 |
(s1.flags() & (STATIC|SYNTHETIC|BRIDGE)) != 0 || |
|
1849 |
!s1.isInheritedIn(site.tsym, types) || |
|
1850 |
((MethodSymbol)s1).implementation(site.tsym, |
|
1851 |
types, |
|
1852 |
true) != s1) |
|
1853 |
continue; |
|
1854 |
Type st1 = types.memberType(t1, s1); |
|
1855 |
int s1ArgsLength = st1.getParameterTypes().length(); |
|
1856 |
if (st1 == s1.type) continue; |
|
1857 |
||
1858 |
for (Type t2 = sup; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1859 |
t2.hasTag(CLASS); |
10 | 1860 |
t2 = types.supertype(t2)) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
1861 |
for (Symbol s2 : t2.tsym.members().getSymbolsByName(s1.name)) { |
10 | 1862 |
if (s2 == s1 || |
1863 |
s2.kind != MTH || |
|
1864 |
(s2.flags() & (STATIC|SYNTHETIC|BRIDGE)) != 0 || |
|
1865 |
s2.type.getParameterTypes().length() != s1ArgsLength || |
|
1866 |
!s2.isInheritedIn(site.tsym, types) || |
|
1867 |
((MethodSymbol)s2).implementation(site.tsym, |
|
1868 |
types, |
|
1869 |
true) != s2) |
|
1870 |
continue; |
|
1871 |
Type st2 = types.memberType(t2, s2); |
|
1872 |
if (types.overrideEquivalent(st1, st2)) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1873 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
1874 |
Errors.ConcreteInheritanceConflict(s1, t1, s2, t2, sup)); |
10 | 1875 |
} |
1876 |
} |
|
1877 |
} |
|
1878 |
} |
|
1879 |
} |
|
1880 |
||
1881 |
/** Check that classes (or interfaces) do not each define an abstract |
|
1882 |
* method with same name and arguments but incompatible return types. |
|
1883 |
* @param pos Position to be used for error reporting. |
|
1884 |
* @param t1 The first argument type. |
|
1885 |
* @param t2 The second argument type. |
|
1886 |
*/ |
|
1887 |
public boolean checkCompatibleAbstracts(DiagnosticPosition pos, |
|
1888 |
Type t1, |
|
1889 |
Type t2, |
|
1890 |
Type site) { |
|
24902
de6c922c8712
8015101: Covariance of return type implied by upper bounding on type parameter is ignored
dlsmith
parents:
24612
diff
changeset
|
1891 |
if ((site.tsym.flags() & COMPOUND) != 0) { |
de6c922c8712
8015101: Covariance of return type implied by upper bounding on type parameter is ignored
dlsmith
parents:
24612
diff
changeset
|
1892 |
// special case for intersections: need to eliminate wildcards in supertypes |
de6c922c8712
8015101: Covariance of return type implied by upper bounding on type parameter is ignored
dlsmith
parents:
24612
diff
changeset
|
1893 |
t1 = types.capture(t1); |
de6c922c8712
8015101: Covariance of return type implied by upper bounding on type parameter is ignored
dlsmith
parents:
24612
diff
changeset
|
1894 |
t2 = types.capture(t2); |
de6c922c8712
8015101: Covariance of return type implied by upper bounding on type parameter is ignored
dlsmith
parents:
24612
diff
changeset
|
1895 |
} |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1896 |
return firstIncompatibility(pos, t1, t2, site) == null; |
10 | 1897 |
} |
1898 |
||
1899 |
/** Return the first method which is defined with same args |
|
1900 |
* but different return types in two given interfaces, or null if none |
|
1901 |
* exists. |
|
1902 |
* @param t1 The first type. |
|
1903 |
* @param t2 The second type. |
|
1904 |
* @param site The most derived type. |
|
1905 |
* @returns symbol from t2 that conflicts with one in t1. |
|
1906 |
*/ |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1907 |
private Symbol firstIncompatibility(DiagnosticPosition pos, Type t1, Type t2, Type site) { |
22163 | 1908 |
Map<TypeSymbol,Type> interfaces1 = new HashMap<>(); |
10 | 1909 |
closure(t1, interfaces1); |
1910 |
Map<TypeSymbol,Type> interfaces2; |
|
1911 |
if (t1 == t2) |
|
1912 |
interfaces2 = interfaces1; |
|
1913 |
else |
|
22163 | 1914 |
closure(t2, interfaces1, interfaces2 = new HashMap<>()); |
10 | 1915 |
|
1916 |
for (Type t3 : interfaces1.values()) { |
|
1917 |
for (Type t4 : interfaces2.values()) { |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1918 |
Symbol s = firstDirectIncompatibility(pos, t3, t4, site); |
10 | 1919 |
if (s != null) return s; |
1920 |
} |
|
1921 |
} |
|
1922 |
return null; |
|
1923 |
} |
|
1924 |
||
1925 |
/** Compute all the supertypes of t, indexed by type symbol. */ |
|
1926 |
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
|
1927 |
if (!t.hasTag(CLASS)) return; |
10 | 1928 |
if (typeMap.put(t.tsym, t) == null) { |
1929 |
closure(types.supertype(t), typeMap); |
|
1930 |
for (Type i : types.interfaces(t)) |
|
1931 |
closure(i, typeMap); |
|
1932 |
} |
|
1933 |
} |
|
1934 |
||
1935 |
/** Compute all the supertypes of t, indexed by type symbol (except thise in typesSkip). */ |
|
1936 |
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
|
1937 |
if (!t.hasTag(CLASS)) return; |
10 | 1938 |
if (typesSkip.get(t.tsym) != null) return; |
1939 |
if (typeMap.put(t.tsym, t) == null) { |
|
1940 |
closure(types.supertype(t), typesSkip, typeMap); |
|
1941 |
for (Type i : types.interfaces(t)) |
|
1942 |
closure(i, typesSkip, typeMap); |
|
1943 |
} |
|
1944 |
} |
|
1945 |
||
1946 |
/** 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
|
1947 |
private Symbol firstDirectIncompatibility(DiagnosticPosition pos, Type t1, Type t2, Type site) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
1948 |
for (Symbol s1 : t1.tsym.members().getSymbols(NON_RECURSIVE)) { |
10 | 1949 |
Type st1 = null; |
14800
4bed1223fdf2
8004094: Javac compiler error - synthetic method accessor generated with duplicate name
mcimadamore
parents:
14547
diff
changeset
|
1950 |
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
|
1951 |
(s1.flags() & SYNTHETIC) != 0) continue; |
10 | 1952 |
Symbol impl = ((MethodSymbol)s1).implementation(site.tsym, types, false); |
1953 |
if (impl != null && (impl.flags() & ABSTRACT) == 0) continue; |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
1954 |
for (Symbol s2 : t2.tsym.members().getSymbolsByName(s1.name)) { |
10 | 1955 |
if (s1 == s2) continue; |
14800
4bed1223fdf2
8004094: Javac compiler error - synthetic method accessor generated with duplicate name
mcimadamore
parents:
14547
diff
changeset
|
1956 |
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
|
1957 |
(s2.flags() & SYNTHETIC) != 0) continue; |
10 | 1958 |
if (st1 == null) st1 = types.memberType(t1, s1); |
1959 |
Type st2 = types.memberType(t2, s2); |
|
1960 |
if (types.overrideEquivalent(st1, st2)) { |
|
1961 |
List<Type> tvars1 = st1.getTypeArguments(); |
|
1962 |
List<Type> tvars2 = st2.getTypeArguments(); |
|
1963 |
Type rt1 = st1.getReturnType(); |
|
1964 |
Type rt2 = types.subst(st2.getReturnType(), tvars2, tvars1); |
|
1965 |
boolean compat = |
|
1966 |
types.isSameType(rt1, rt2) || |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1967 |
!rt1.isPrimitiveOrVoid() && |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1968 |
!rt2.isPrimitiveOrVoid() && |
14547 | 1969 |
(types.covariantReturnType(rt1, rt2, types.noWarnings) || |
1970 |
types.covariantReturnType(rt2, rt1, types.noWarnings)) || |
|
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1971 |
checkCommonOverriderIn(s1,s2,site); |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1972 |
if (!compat) { |
48352
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
1973 |
log.error(pos, Errors.TypesIncompatible(t1, t2, |
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
1974 |
Fragments.IncompatibleDiffRet(s2.name, types.memberType(t2, s2).getParameterTypes()))); |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1975 |
return s2; |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1976 |
} |
8610
62e3274feecc
7020657: Javac rejects a fairly common idiom with raw override and interfaces
mcimadamore
parents:
8427
diff
changeset
|
1977 |
} 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
|
1978 |
!checkCommonOverriderIn(s1, s2, site)) { |
45413
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
1979 |
log.error(pos, Errors.NameClashSameErasureNoOverride( |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
1980 |
s1.name, types.memberType(site, s1).asMethodType().getParameterTypes(), s1.location(), |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
1981 |
s2.name, types.memberType(site, s2).asMethodType().getParameterTypes(), s2.location())); |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
1982 |
return s2; |
10 | 1983 |
} |
1984 |
} |
|
1985 |
} |
|
1986 |
return null; |
|
1987 |
} |
|
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1988 |
//WHERE |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1989 |
boolean checkCommonOverriderIn(Symbol s1, Symbol s2, Type site) { |
22163 | 1990 |
Map<TypeSymbol,Type> supertypes = new HashMap<>(); |
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1991 |
Type st1 = types.memberType(site, s1); |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1992 |
Type st2 = types.memberType(site, s2); |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1993 |
closure(site, supertypes); |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1994 |
for (Type t : supertypes.values()) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
1995 |
for (Symbol s3 : t.tsym.members().getSymbolsByName(s1.name)) { |
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
1996 |
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
|
1997 |
Type st3 = types.memberType(site,s3); |
18380
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
1998 |
if (types.overrideEquivalent(st3, st1) && |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
1999 |
types.overrideEquivalent(st3, st2) && |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
2000 |
types.returnTypeSubstitutable(st3, st1) && |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
2001 |
types.returnTypeSubstitutable(st3, st2)) { |
2abcb1c3a593
8008627: Compiler mishandles three-way return-type-substitutability
mcimadamore
parents:
17805
diff
changeset
|
2002 |
return true; |
812
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
2003 |
} |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
2004 |
} |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
2005 |
} |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
2006 |
return false; |
d60171f70ade
6294779: Problem with interface inheritance and covariant return types
mcimadamore
parents:
661
diff
changeset
|
2007 |
} |
10 | 2008 |
|
2009 |
/** Check that a given method conforms with any method it overrides. |
|
2010 |
* @param tree The tree from which positions are extracted |
|
2011 |
* for errors. |
|
2012 |
* @param m The overriding method. |
|
2013 |
*/ |
|
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
2014 |
void checkOverride(Env<AttrContext> env, JCMethodDecl tree, MethodSymbol m) { |
10 | 2015 |
ClassSymbol origin = (ClassSymbol)m.owner; |
2016 |
if ((origin.flags() & ENUM) != 0 && names.finalize.equals(m.name)) |
|
2017 |
if (m.overrides(syms.enumFinalFinalize, origin, types, false)) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2018 |
log.error(tree.pos(), Errors.EnumNoFinalize); |
10 | 2019 |
return; |
2020 |
} |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2021 |
for (Type t = origin.type; t.hasTag(CLASS); |
10 | 2022 |
t = types.supertype(t)) { |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2023 |
if (t != origin.type) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2024 |
checkOverride(tree, t, origin, m); |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2025 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2026 |
for (Type t2 : types.interfaces(t)) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2027 |
checkOverride(tree, t2, origin, m); |
10 | 2028 |
} |
2029 |
} |
|
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2030 |
|
36272
950bd442a822
8151018: javac should emit a clearer diagnostic when a <> inferred anonymous type's non-private methods don't override super's
sadayapalam
parents:
36153
diff
changeset
|
2031 |
final boolean explicitOverride = m.attribute(syms.overrideType.tsym) != null; |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
2032 |
// Check if this method must override a super method due to being annotated with @Override |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
2033 |
// or by virtue of being a member of a diamond inferred anonymous class. Latter case is to |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
2034 |
// be treated "as if as they were annotated" with @Override. |
36272
950bd442a822
8151018: javac should emit a clearer diagnostic when a <> inferred anonymous type's non-private methods don't override super's
sadayapalam
parents:
36153
diff
changeset
|
2035 |
boolean mustOverride = explicitOverride || |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
2036 |
(env.info.isAnonymousDiamond && !m.isConstructor() && !m.isPrivate()); |
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
29293
diff
changeset
|
2037 |
if (mustOverride && !isOverrider(m)) { |
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2038 |
DiagnosticPosition pos = tree.pos(); |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2039 |
for (JCAnnotation a : tree.getModifiers().annotations) { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2040 |
if (a.annotationType.type.tsym == syms.overrideType.tsym) { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2041 |
pos = a.pos(); |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2042 |
break; |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2043 |
} |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2044 |
} |
36272
950bd442a822
8151018: javac should emit a clearer diagnostic when a <> inferred anonymous type's non-private methods don't override super's
sadayapalam
parents:
36153
diff
changeset
|
2045 |
log.error(pos, |
45758
b2a0122861f5
8068836: Error message should be updated when Override is used with static methods
sadayapalam
parents:
45756
diff
changeset
|
2046 |
explicitOverride ? (m.isStatic() ? Errors.StaticMethodsCannotBeAnnotatedWithOverride : Errors.MethodDoesNotOverrideSuperclass) : |
36272
950bd442a822
8151018: javac should emit a clearer diagnostic when a <> inferred anonymous type's non-private methods don't override super's
sadayapalam
parents:
36153
diff
changeset
|
2047 |
Errors.AnonymousDiamondMethodDoesNotOverrideSuperclass(Fragments.DiamondAnonymousMethodsImplicitlyOverride)); |
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2048 |
} |
10 | 2049 |
} |
2050 |
||
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2051 |
void checkOverride(JCTree tree, Type site, ClassSymbol origin, MethodSymbol m) { |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2052 |
TypeSymbol c = site.tsym; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2053 |
for (Symbol sym : c.members().getSymbolsByName(m.name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2054 |
if (m.overrides(sym, origin, types, false)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2055 |
if ((sym.flags() & ABSTRACT) == 0) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2056 |
checkOverride(tree, m, (MethodSymbol)sym, origin); |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2057 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2058 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2059 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2060 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2061 |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
2062 |
private Filter<Symbol> equalsHasCodeFilter = s -> MethodSymbol.implementation_filter.accepts(s) && |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
2063 |
(s.flags() & BAD_OVERRIDE) == 0; |
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
|
2064 |
|
16333 | 2065 |
public void checkClassOverrideEqualsAndHashIfNeeded(DiagnosticPosition pos, |
2066 |
ClassSymbol someClass) { |
|
2067 |
/* At present, annotations cannot possibly have a method that is override |
|
2068 |
* equivalent with Object.equals(Object) but in any case the condition is |
|
2069 |
* fine for completeness. |
|
2070 |
*/ |
|
2071 |
if (someClass == (ClassSymbol)syms.objectType.tsym || |
|
2072 |
someClass.isInterface() || someClass.isEnum() || |
|
2073 |
(someClass.flags() & ANNOTATION) != 0 || |
|
2074 |
(someClass.flags() & ABSTRACT) != 0) return; |
|
2075 |
//anonymous inner classes implementing interfaces need especial treatment |
|
2076 |
if (someClass.isAnonymous()) { |
|
2077 |
List<Type> interfaces = types.interfaces(someClass.type); |
|
2078 |
if (interfaces != null && !interfaces.isEmpty() && |
|
2079 |
interfaces.head.tsym == syms.comparatorType.tsym) return; |
|
2080 |
} |
|
2081 |
checkClassOverrideEqualsAndHash(pos, someClass); |
|
2082 |
} |
|
2083 |
||
2084 |
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
|
2085 |
ClassSymbol someClass) { |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
2086 |
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
|
2087 |
MethodSymbol equalsAtObject = (MethodSymbol)syms.objectType |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2088 |
.tsym.members().findFirst(names.equals); |
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
|
2089 |
MethodSymbol hashCodeAtObject = (MethodSymbol)syms.objectType |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2090 |
.tsym.members().findFirst(names.hashCode); |
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
|
2091 |
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
|
2092 |
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
|
2093 |
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
|
2094 |
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
|
2095 |
|
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
|
2096 |
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
|
2097 |
log.warning(LintCategory.OVERRIDES, pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2098 |
Warnings.OverrideEqualsButNotHashcode(someClass)); |
16301
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
2099 |
} |
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
2100 |
} |
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
2101 |
} |
b6fd735ea78e
6563143: javac should issue a warning for overriding equals without hashCode
vromero
parents:
16292
diff
changeset
|
2102 |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2103 |
public void checkModuleName (JCModuleDecl tree) { |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2104 |
Name moduleName = tree.sym.name; |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2105 |
Assert.checkNonNull(moduleName); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2106 |
if (lint.isEnabled(LintCategory.MODULE)) { |
44568
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2107 |
JCExpression qualId = tree.qualId; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2108 |
while (qualId != null) { |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2109 |
Name componentName; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2110 |
DiagnosticPosition pos; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2111 |
switch (qualId.getTag()) { |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2112 |
case SELECT: |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2113 |
JCFieldAccess selectNode = ((JCFieldAccess) qualId); |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2114 |
componentName = selectNode.name; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2115 |
pos = selectNode.pos(); |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2116 |
qualId = selectNode.selected; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2117 |
break; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2118 |
case IDENT: |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2119 |
componentName = ((JCIdent) qualId).name; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2120 |
pos = qualId.pos(); |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2121 |
qualId = null; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2122 |
break; |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2123 |
default: |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2124 |
throw new AssertionError("Unexpected qualified identifier: " + qualId.toString()); |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2125 |
} |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2126 |
if (componentName != null) { |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2127 |
String moduleNameComponentString = componentName.toString(); |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2128 |
int nameLength = moduleNameComponentString.length(); |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2129 |
if (nameLength > 0 && Character.isDigit(moduleNameComponentString.charAt(nameLength - 1))) { |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2130 |
log.warning(Lint.LintCategory.MODULE, pos, Warnings.PoorChoiceForModuleName(componentName)); |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2131 |
} |
3d870d326626
8176572: Javac does not enforce module name restrictions
sadayapalam
parents:
43588
diff
changeset
|
2132 |
} |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2133 |
} |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2134 |
} |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2135 |
} |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
2136 |
|
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2137 |
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
|
2138 |
ClashFilter cf = new ClashFilter(origin.type); |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2139 |
return (cf.accepts(s1) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2140 |
cf.accepts(s2) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2141 |
types.hasSameArgs(s1.erasure(types), s2.erasure(types))); |
7214
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2142 |
} |
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2143 |
|
26dfa4a69593
6985719: Alike methods in interfaces (Inheritance and Overriding)
mcimadamore
parents:
6721
diff
changeset
|
2144 |
|
10 | 2145 |
/** Check that all abstract members of given class have definitions. |
2146 |
* @param pos Position to be used for error reporting. |
|
2147 |
* @param c The class. |
|
2148 |
*/ |
|
2149 |
void checkAllDefined(DiagnosticPosition pos, ClassSymbol c) { |
|
28459
48a68a485760
8068517: Compiler may generate wrong InnerClasses attribute for static enum reference
jlahoda
parents:
27857
diff
changeset
|
2150 |
MethodSymbol undef = types.firstUnimplementedAbstract(c); |
48a68a485760
8068517: Compiler may generate wrong InnerClasses attribute for static enum reference
jlahoda
parents:
27857
diff
changeset
|
2151 |
if (undef != null) { |
48a68a485760
8068517: Compiler may generate wrong InnerClasses attribute for static enum reference
jlahoda
parents:
27857
diff
changeset
|
2152 |
MethodSymbol undef1 = |
48a68a485760
8068517: Compiler may generate wrong InnerClasses attribute for static enum reference
jlahoda
parents:
27857
diff
changeset
|
2153 |
new MethodSymbol(undef.flags(), undef.name, |
48a68a485760
8068517: Compiler may generate wrong InnerClasses attribute for static enum reference
jlahoda
parents:
27857
diff
changeset
|
2154 |
types.memberType(c.type, undef), undef.owner); |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2155 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2156 |
Errors.DoesNotOverrideAbstract(c, undef1, undef1.location())); |
10 | 2157 |
} |
2158 |
} |
|
2159 |
||
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2160 |
void checkNonCyclicDecl(JCClassDecl tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2161 |
CycleChecker cc = new CycleChecker(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2162 |
cc.scan(tree); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2163 |
if (!cc.errorFound && !cc.partialCheck) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2164 |
tree.sym.flags_field |= ACYCLIC; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2165 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2166 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2167 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2168 |
class CycleChecker extends TreeScanner { |
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 |
List<Symbol> seenClasses = List.nil(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2171 |
boolean errorFound = false; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2172 |
boolean partialCheck = false; |
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 |
private void checkSymbol(DiagnosticPosition pos, Symbol sym) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2175 |
if (sym != null && sym.kind == TYP) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2176 |
Env<AttrContext> classEnv = enter.getEnv((TypeSymbol)sym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2177 |
if (classEnv != null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2178 |
DiagnosticSource prevSource = log.currentSource(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2179 |
try { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2180 |
log.useSource(classEnv.toplevel.sourcefile); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2181 |
scan(classEnv.tree); |
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 |
finally { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2184 |
log.useSource(prevSource.getFile()); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2185 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2186 |
} else if (sym.kind == TYP) { |
42828
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
42827
diff
changeset
|
2187 |
checkClass(pos, sym, List.nil()); |
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2188 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2189 |
} else { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2190 |
//not completed yet |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2191 |
partialCheck = true; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2192 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2193 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2194 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2195 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2196 |
public void visitSelect(JCFieldAccess tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2197 |
super.visitSelect(tree); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2198 |
checkSymbol(tree.pos(), tree.sym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2199 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2200 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2201 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2202 |
public void visitIdent(JCIdent tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2203 |
checkSymbol(tree.pos(), tree.sym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2204 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2205 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2206 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2207 |
public void visitTypeApply(JCTypeApply tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2208 |
scan(tree.clazz); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2209 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2210 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2211 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2212 |
public void visitTypeArray(JCArrayTypeTree tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2213 |
scan(tree.elemtype); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2214 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2215 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2216 |
@Override |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2217 |
public void visitClassDef(JCClassDecl tree) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2218 |
List<JCTree> supertypes = List.nil(); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2219 |
if (tree.getExtendsClause() != null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2220 |
supertypes = supertypes.prepend(tree.getExtendsClause()); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2221 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2222 |
if (tree.getImplementsClause() != null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2223 |
for (JCTree intf : tree.getImplementsClause()) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2224 |
supertypes = supertypes.prepend(intf); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2225 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2226 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2227 |
checkClass(tree.pos(), tree.sym, supertypes); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2228 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2229 |
|
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2230 |
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
|
2231 |
if ((c.flags_field & ACYCLIC) != 0) |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2232 |
return; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2233 |
if (seenClasses.contains(c)) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2234 |
errorFound = true; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2235 |
noteCyclic(pos, (ClassSymbol)c); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2236 |
} else if (!c.type.isErroneous()) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2237 |
try { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2238 |
seenClasses = seenClasses.prepend(c); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2239 |
if (c.type.hasTag(CLASS)) { |
6711
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2240 |
if (supertypes.nonEmpty()) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2241 |
scan(supertypes); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2242 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2243 |
else { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2244 |
ClassType ct = (ClassType)c.type; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2245 |
if (ct.supertype_field == null || |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2246 |
ct.interfaces_field == null) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2247 |
//not completed yet |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2248 |
partialCheck = true; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2249 |
return; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2250 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2251 |
checkSymbol(pos, ct.supertype_field.tsym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2252 |
for (Type intf : ct.interfaces_field) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2253 |
checkSymbol(pos, intf.tsym); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2254 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2255 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2256 |
if (c.owner.kind == TYP) { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2257 |
checkSymbol(pos, c.owner); |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2258 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2259 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2260 |
} finally { |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2261 |
seenClasses = seenClasses.tail; |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2262 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2263 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2264 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2265 |
} |
fc9732adc790
6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents:
6352
diff
changeset
|
2266 |
|
10 | 2267 |
/** Check for cyclic references. Issue an error if the |
2268 |
* symbol of the type referred to has a LOCKED flag set. |
|
2269 |
* |
|
2270 |
* @param pos Position to be used for error reporting. |
|
2271 |
* @param t The type referred to. |
|
2272 |
*/ |
|
2273 |
void checkNonCyclic(DiagnosticPosition pos, Type t) { |
|
2274 |
checkNonCyclicInternal(pos, t); |
|
2275 |
} |
|
2276 |
||
2277 |
||
2278 |
void checkNonCyclic(DiagnosticPosition pos, TypeVar t) { |
|
42828
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
42827
diff
changeset
|
2279 |
checkNonCyclic1(pos, t, List.nil()); |
10 | 2280 |
} |
2281 |
||
2219
03b1b17c4b2e
6804733: javac generates spourious diagnostics for ill-formed type-variable bounds
mcimadamore
parents:
1874
diff
changeset
|
2282 |
private void checkNonCyclic1(DiagnosticPosition pos, Type t, List<TypeVar> seen) { |
10 | 2283 |
final TypeVar tv; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2284 |
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
|
2285 |
return; |
10 | 2286 |
if (seen.contains(t)) { |
24396 | 2287 |
tv = (TypeVar)t; |
53515
a772e65727c5
8193367: Annotated type variable bounds crash javac
bsrbnd
parents:
53390
diff
changeset
|
2288 |
tv.setUpperBound(types.createErrorType(t)); |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2289 |
log.error(pos, Errors.CyclicInheritance(t)); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2290 |
} else if (t.hasTag(TYPEVAR)) { |
24396 | 2291 |
tv = (TypeVar)t; |
2219
03b1b17c4b2e
6804733: javac generates spourious diagnostics for ill-formed type-variable bounds
mcimadamore
parents:
1874
diff
changeset
|
2292 |
seen = seen.prepend(tv); |
10 | 2293 |
for (Type b : types.getBounds(tv)) |
2294 |
checkNonCyclic1(pos, b, seen); |
|
2295 |
} |
|
2296 |
} |
|
2297 |
||
2298 |
/** Check for cyclic references. Issue an error if the |
|
2299 |
* symbol of the type referred to has a LOCKED flag set. |
|
2300 |
* |
|
2301 |
* @param pos Position to be used for error reporting. |
|
2302 |
* @param t The type referred to. |
|
2303 |
* @returns True if the check completed on all attributed classes |
|
2304 |
*/ |
|
2305 |
private boolean checkNonCyclicInternal(DiagnosticPosition pos, Type t) { |
|
2306 |
boolean complete = true; // was the check complete? |
|
2307 |
//- System.err.println("checkNonCyclicInternal("+t+");");//DEBUG |
|
2308 |
Symbol c = t.tsym; |
|
2309 |
if ((c.flags_field & ACYCLIC) != 0) return true; |
|
2310 |
||
2311 |
if ((c.flags_field & LOCKED) != 0) { |
|
2312 |
noteCyclic(pos, (ClassSymbol)c); |
|
2313 |
} else if (!c.type.isErroneous()) { |
|
2314 |
try { |
|
2315 |
c.flags_field |= LOCKED; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2316 |
if (c.type.hasTag(CLASS)) { |
10 | 2317 |
ClassType clazz = (ClassType)c.type; |
2318 |
if (clazz.interfaces_field != null) |
|
2319 |
for (List<Type> l=clazz.interfaces_field; l.nonEmpty(); l=l.tail) |
|
2320 |
complete &= checkNonCyclicInternal(pos, l.head); |
|
2321 |
if (clazz.supertype_field != null) { |
|
2322 |
Type st = clazz.supertype_field; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2323 |
if (st != null && st.hasTag(CLASS)) |
10 | 2324 |
complete &= checkNonCyclicInternal(pos, st); |
2325 |
} |
|
2326 |
if (c.owner.kind == TYP) |
|
2327 |
complete &= checkNonCyclicInternal(pos, c.owner.type); |
|
2328 |
} |
|
2329 |
} finally { |
|
2330 |
c.flags_field &= ~LOCKED; |
|
2331 |
} |
|
2332 |
} |
|
2333 |
if (complete) |
|
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29959
diff
changeset
|
2334 |
complete = ((c.flags_field & UNATTRIBUTED) == 0) && c.isCompleted(); |
10 | 2335 |
if (complete) c.flags_field |= ACYCLIC; |
2336 |
return complete; |
|
2337 |
} |
|
2338 |
||
2339 |
/** Note that we found an inheritance cycle. */ |
|
2340 |
private void noteCyclic(DiagnosticPosition pos, ClassSymbol c) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2341 |
log.error(pos, Errors.CyclicInheritance(c)); |
10 | 2342 |
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
|
2343 |
l.head = types.createErrorType((ClassSymbol)l.head.tsym, Type.noType); |
10 | 2344 |
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
|
2345 |
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
|
2346 |
((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
|
2347 |
c.type = types.createErrorType(c, c.type); |
10 | 2348 |
c.flags_field |= ACYCLIC; |
2349 |
} |
|
2350 |
||
2351 |
/** Check that all methods which implement some |
|
2352 |
* method conform to the method they implement. |
|
2353 |
* @param tree The class definition whose members are checked. |
|
2354 |
*/ |
|
2355 |
void checkImplementations(JCClassDecl tree) { |
|
14547 | 2356 |
checkImplementations(tree, tree.sym, tree.sym); |
10 | 2357 |
} |
15385 | 2358 |
//where |
10 | 2359 |
/** Check that all methods which implement some |
2360 |
* method in `ic' conform to the method they implement. |
|
2361 |
*/ |
|
14547 | 2362 |
void checkImplementations(JCTree tree, ClassSymbol origin, ClassSymbol ic) { |
10 | 2363 |
for (List<Type> l = types.closure(ic.type); l.nonEmpty(); l = l.tail) { |
2364 |
ClassSymbol lc = (ClassSymbol)l.head.tsym; |
|
25445
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
2365 |
if ((lc.flags() & ABSTRACT) != 0) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2366 |
for (Symbol sym : lc.members().getSymbols(NON_RECURSIVE)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2367 |
if (sym.kind == MTH && |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2368 |
(sym.flags() & (STATIC|ABSTRACT)) == ABSTRACT) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2369 |
MethodSymbol absmeth = (MethodSymbol)sym; |
10 | 2370 |
MethodSymbol implmeth = absmeth.implementation(origin, types, false); |
2371 |
if (implmeth != null && implmeth != absmeth && |
|
2372 |
(implmeth.owner.flags() & INTERFACE) == |
|
2373 |
(origin.flags() & INTERFACE)) { |
|
2374 |
// don't check if implmeth is in a class, yet |
|
2375 |
// origin is an interface. This case arises only |
|
2376 |
// if implmeth is declared in Object. The reason is |
|
2377 |
// that interfaces really don't inherit from |
|
2378 |
// Object it's just that the compiler represents |
|
2379 |
// things that way. |
|
2380 |
checkOverride(tree, implmeth, absmeth, origin); |
|
2381 |
} |
|
2382 |
} |
|
2383 |
} |
|
2384 |
} |
|
2385 |
} |
|
2386 |
} |
|
2387 |
||
2388 |
/** Check that all abstract methods implemented by a class are |
|
2389 |
* mutually compatible. |
|
2390 |
* @param pos Position to be used for error reporting. |
|
2391 |
* @param c The class whose interfaces are checked. |
|
2392 |
*/ |
|
2393 |
void checkCompatibleSupertypes(DiagnosticPosition pos, Type c) { |
|
2394 |
List<Type> supertypes = types.interfaces(c); |
|
2395 |
Type supertype = types.supertype(c); |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2396 |
if (supertype.hasTag(CLASS) && |
10 | 2397 |
(supertype.tsym.flags() & ABSTRACT) != 0) |
2398 |
supertypes = supertypes.prepend(supertype); |
|
2399 |
for (List<Type> l = supertypes; l.nonEmpty(); l = l.tail) { |
|
25445
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
2400 |
if (!l.head.getTypeArguments().isEmpty() && |
10 | 2401 |
!checkCompatibleAbstracts(pos, l.head, l.head, c)) |
2402 |
return; |
|
2403 |
for (List<Type> m = supertypes; m != l; m = m.tail) |
|
2404 |
if (!checkCompatibleAbstracts(pos, l.head, m.head, c)) |
|
2405 |
return; |
|
2406 |
} |
|
2407 |
checkCompatibleConcretes(pos, c); |
|
2408 |
} |
|
2409 |
||
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2410 |
/** 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
|
2411 |
* 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
|
2412 |
* |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2413 |
* @param pos Position to be used for error reporting. |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2414 |
* @param site The class whose methods are checked. |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2415 |
* @param sym The method symbol to be checked. |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2416 |
*/ |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2417 |
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
|
2418 |
ClashFilter cf = new ClashFilter(site); |
11868
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2419 |
//for each method m1 that is overridden (directly or indirectly) |
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2420 |
//by method 'sym' in 'site'... |
21025
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2421 |
|
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2422 |
List<MethodSymbol> potentiallyAmbiguousList = List.nil(); |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2423 |
boolean overridesAny = false; |
55358 | 2424 |
ArrayList<Symbol> symbolsByName = new ArrayList<>(); |
2425 |
types.membersClosure(site, false).getSymbolsByName(sym.name, cf).forEach(symbolsByName::add); |
|
2426 |
for (Symbol m1 : symbolsByName) { |
|
21025
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2427 |
if (!sym.overrides(m1, site.tsym, types, false)) { |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2428 |
if (m1 == sym) { |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2429 |
continue; |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2430 |
} |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2431 |
|
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2432 |
if (!overridesAny) { |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2433 |
potentiallyAmbiguousList = potentiallyAmbiguousList.prepend((MethodSymbol)m1); |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2434 |
} |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2435 |
continue; |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2436 |
} |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2437 |
|
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2438 |
if (m1 != sym) { |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2439 |
overridesAny = true; |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2440 |
potentiallyAmbiguousList = List.nil(); |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2441 |
} |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2442 |
|
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2443 |
//...check each method m2 that is a member of 'site' |
55358 | 2444 |
for (Symbol m2 : symbolsByName) { |
11868
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2445 |
if (m2 == m1) continue; |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2446 |
//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
|
2447 |
//a member of 'site') and (ii) m1 has the same erasure as m2, issue an error |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
2448 |
if (!types.isSubSignature(sym.type, types.memberType(site, m2), Feature.STRICT_METHOD_CLASH_CHECK.allowedInSource(source)) && |
11868
35f55dadfe88
7142086: performance problem in Check.checkOverrideClashes(...)
mcimadamore
parents:
11314
diff
changeset
|
2449 |
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
|
2450 |
sym.flags_field |= CLASH; |
45413
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2451 |
if (m1 == sym) { |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2452 |
log.error(pos, Errors.NameClashSameErasureNoOverride( |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2453 |
m1.name, types.memberType(site, m1).asMethodType().getParameterTypes(), m1.location(), |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2454 |
m2.name, types.memberType(site, m2).asMethodType().getParameterTypes(), m2.location())); |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2455 |
} else { |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2456 |
ClassType ct = (ClassType)site; |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2457 |
String kind = ct.isInterface() ? "interface" : "class"; |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2458 |
log.error(pos, Errors.NameClashSameErasureNoOverride1( |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2459 |
kind, |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2460 |
ct.tsym.name, |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2461 |
m1.name, |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2462 |
types.memberType(site, m1).asMethodType().getParameterTypes(), |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2463 |
m1.location(), |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2464 |
m2.name, |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2465 |
types.memberType(site, m2).asMethodType().getParameterTypes(), |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2466 |
m2.location())); |
75202c6b2c35
7170058: Confusing error message from javac when overriding a method from a raw supertype
vromero
parents:
44576
diff
changeset
|
2467 |
} |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2468 |
return; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2469 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2470 |
} |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2471 |
} |
21025
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2472 |
|
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2473 |
if (!overridesAny) { |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2474 |
for (MethodSymbol m: potentiallyAmbiguousList) { |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2475 |
checkPotentiallyAmbiguousOverloads(pos, site, sym, m); |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2476 |
} |
9d4e765fe447
8024947: javac should issue the potentially ambiguous overload warning only where the problem appears
vromero
parents:
21018
diff
changeset
|
2477 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2478 |
} |
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2479 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2480 |
/** 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
|
2481 |
* mutually compatible (JLS 8.4.8). |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2482 |
* |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2483 |
* @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
|
2484 |
* @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
|
2485 |
* @param sym The method symbol to be checked. |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2486 |
*/ |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2487 |
void checkHideClashes(DiagnosticPosition pos, Type site, MethodSymbol sym) { |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2488 |
ClashFilter cf = new ClashFilter(site); |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2489 |
//for each method m1 that is a member of 'site'... |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2490 |
for (Symbol s : types.membersClosure(site, true).getSymbolsByName(sym.name, cf)) { |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2491 |
//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
|
2492 |
//a member of 'site') and (ii) 'sym' has the same erasure as m1, issue an error |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
2493 |
if (!types.isSubSignature(sym.type, types.memberType(site, s), Feature.STRICT_METHOD_CLASH_CHECK.allowedInSource(source))) { |
19914 | 2494 |
if (types.hasSameArgs(s.erasure(types), sym.erasure(types))) { |
2495 |
log.error(pos, |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2496 |
Errors.NameClashSameErasureNoHide(sym, sym.location(), s, s.location())); |
19914 | 2497 |
return; |
2498 |
} else { |
|
2499 |
checkPotentiallyAmbiguousOverloads(pos, site, sym, (MethodSymbol)s); |
|
2500 |
} |
|
2501 |
} |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2502 |
} |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2503 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2504 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2505 |
//where |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2506 |
private class ClashFilter implements Filter<Symbol> { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2507 |
|
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2508 |
Type site; |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2509 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2510 |
ClashFilter(Type site) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2511 |
this.site = site; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2512 |
} |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2513 |
|
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2514 |
boolean shouldSkip(Symbol s) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2515 |
return (s.flags() & CLASH) != 0 && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2516 |
s.owner == site.tsym; |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2517 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2518 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2519 |
public boolean accepts(Symbol s) { |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2520 |
return s.kind == MTH && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2521 |
(s.flags() & SYNTHETIC) == 0 && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2522 |
!shouldSkip(s) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2523 |
s.isInheritedIn(site.tsym, types) && |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2524 |
!s.isConstructor(); |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2525 |
} |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
2526 |
} |
7628
e7baeb97d164
6476118: compiler bug causes runtime ClassCastException for generics overloading
mcimadamore
parents:
7214
diff
changeset
|
2527 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2528 |
void checkDefaultMethodClashes(DiagnosticPosition pos, Type site) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2529 |
DefaultMethodClashFilter dcf = new DefaultMethodClashFilter(site); |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2530 |
for (Symbol m : types.membersClosure(site, false).getSymbols(dcf)) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2531 |
Assert.check(m.kind == MTH); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2532 |
List<MethodSymbol> prov = types.interfaceCandidates(site, (MethodSymbol)m); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2533 |
if (prov.size() > 1) { |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
20240
diff
changeset
|
2534 |
ListBuffer<Symbol> abstracts = new ListBuffer<>(); |
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
20240
diff
changeset
|
2535 |
ListBuffer<Symbol> defaults = new ListBuffer<>(); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2536 |
for (MethodSymbol provSym : prov) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2537 |
if ((provSym.flags() & DEFAULT) != 0) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2538 |
defaults = defaults.append(provSym); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2539 |
} else if ((provSym.flags() & ABSTRACT) != 0) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2540 |
abstracts = abstracts.append(provSym); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2541 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2542 |
if (defaults.nonEmpty() && defaults.size() + abstracts.size() >= 2) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2543 |
//strong semantics - issue an error if two sibling interfaces |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2544 |
//have two override-equivalent defaults - or if one is abstract |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2545 |
//and the other is default |
48352
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2546 |
Fragment diagKey; |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2547 |
Symbol s1 = defaults.first(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2548 |
Symbol s2; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2549 |
if (defaults.size() > 1) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2550 |
s2 = defaults.toList().tail.head; |
48352
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2551 |
diagKey = Fragments.IncompatibleUnrelatedDefaults(Kinds.kindName(site.tsym), site, |
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2552 |
m.name, types.memberType(site, m).getParameterTypes(), |
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2553 |
s1.location(), s2.location()); |
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2554 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2555 |
} else { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2556 |
s2 = abstracts.first(); |
48352
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2557 |
diagKey = Fragments.IncompatibleAbstractDefault(Kinds.kindName(site.tsym), site, |
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2558 |
m.name, types.memberType(site, m).getParameterTypes(), |
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2559 |
s1.location(), s2.location()); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2560 |
} |
48352
9b700a5c4381
8057650: uniform error diagnostics for inconsistent inherited method signatures
mcimadamore
parents:
48054
diff
changeset
|
2561 |
log.error(pos, Errors.TypesIncompatible(s1.location().type, s2.location().type, diagKey)); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2562 |
break; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2563 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2564 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2565 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2566 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2567 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2568 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2569 |
//where |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2570 |
private class DefaultMethodClashFilter implements Filter<Symbol> { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2571 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2572 |
Type site; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2573 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2574 |
DefaultMethodClashFilter(Type site) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2575 |
this.site = site; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2576 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2577 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2578 |
public boolean accepts(Symbol s) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2579 |
return s.kind == MTH && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2580 |
(s.flags() & DEFAULT) != 0 && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2581 |
s.isInheritedIn(site.tsym, types) && |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2582 |
!s.isConstructor(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2583 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2584 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
14369
diff
changeset
|
2585 |
|
19914 | 2586 |
/** |
2587 |
* Report warnings for potentially ambiguous method declarations. Two declarations |
|
2588 |
* are potentially ambiguous if they feature two unrelated functional interface |
|
2589 |
* in same argument position (in which case, a call site passing an implicit |
|
2590 |
* lambda would be ambiguous). |
|
2591 |
*/ |
|
2592 |
void checkPotentiallyAmbiguousOverloads(DiagnosticPosition pos, Type site, |
|
2593 |
MethodSymbol msym1, MethodSymbol msym2) { |
|
2594 |
if (msym1 != msym2 && |
|
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47959
diff
changeset
|
2595 |
Feature.DEFAULT_METHODS.allowedInSource(source) && |
19914 | 2596 |
lint.isEnabled(LintCategory.OVERLOADS) && |
2597 |
(msym1.flags() & POTENTIALLY_AMBIGUOUS) == 0 && |
|
2598 |
(msym2.flags() & POTENTIALLY_AMBIGUOUS) == 0) { |
|
2599 |
Type mt1 = types.memberType(site, msym1); |
|
2600 |
Type mt2 = types.memberType(site, msym2); |
|
2601 |
//if both generic methods, adjust type variables |
|
2602 |
if (mt1.hasTag(FORALL) && mt2.hasTag(FORALL) && |
|
2603 |
types.hasSameBounds((ForAll)mt1, (ForAll)mt2)) { |
|
2604 |
mt2 = types.subst(mt2, ((ForAll)mt2).tvars, ((ForAll)mt1).tvars); |
|
2605 |
} |
|
2606 |
//expand varargs methods if needed |
|
2607 |
int maxLength = Math.max(mt1.getParameterTypes().length(), mt2.getParameterTypes().length()); |
|
2608 |
List<Type> args1 = rs.adjustArgs(mt1.getParameterTypes(), msym1, maxLength, true); |
|
2609 |
List<Type> args2 = rs.adjustArgs(mt2.getParameterTypes(), msym2, maxLength, true); |
|
2610 |
//if arities don't match, exit |
|
2611 |
if (args1.length() != args2.length()) return; |
|
2612 |
boolean potentiallyAmbiguous = false; |
|
2613 |
while (args1.nonEmpty() && args2.nonEmpty()) { |
|
2614 |
Type s = args1.head; |
|
2615 |
Type t = args2.head; |
|
2616 |
if (!types.isSubtype(t, s) && !types.isSubtype(s, t)) { |
|
2617 |
if (types.isFunctionalInterface(s) && types.isFunctionalInterface(t) && |
|
2618 |
types.findDescriptorType(s).getParameterTypes().length() > 0 && |
|
2619 |
types.findDescriptorType(s).getParameterTypes().length() == |
|
2620 |
types.findDescriptorType(t).getParameterTypes().length()) { |
|
2621 |
potentiallyAmbiguous = true; |
|
2622 |
} else { |
|
2623 |
break; |
|
2624 |
} |
|
2625 |
} |
|
2626 |
args1 = args1.tail; |
|
2627 |
args2 = args2.tail; |
|
2628 |
} |
|
2629 |
if (potentiallyAmbiguous) { |
|
2630 |
//we found two incompatible functional interfaces with same arity |
|
2631 |
//this means a call site passing an implicit lambda would be ambigiuous |
|
2632 |
msym1.flags_field |= POTENTIALLY_AMBIGUOUS; |
|
2633 |
msym2.flags_field |= POTENTIALLY_AMBIGUOUS; |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2634 |
log.warning(LintCategory.OVERLOADS, pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2635 |
Warnings.PotentiallyAmbiguousOverload(msym1, msym1.location(), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2636 |
msym2, msym2.location())); |
19914 | 2637 |
return; |
2638 |
} |
|
2639 |
} |
|
2640 |
} |
|
2641 |
||
41629 | 2642 |
void checkAccessFromSerializableElement(final JCTree tree, boolean isLambda) { |
2643 |
if (warnOnAnyAccessToMembers || |
|
2644 |
(lint.isEnabled(LintCategory.SERIAL) && |
|
2645 |
!lint.isSuppressed(LintCategory.SERIAL) && |
|
2646 |
isLambda)) { |
|
24219 | 2647 |
Symbol sym = TreeInfo.symbol(tree); |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
25874
diff
changeset
|
2648 |
if (!sym.kind.matches(KindSelector.VAL_MTH)) { |
24219 | 2649 |
return; |
2650 |
} |
|
2651 |
||
2652 |
if (sym.kind == VAR) { |
|
2653 |
if ((sym.flags() & PARAMETER) != 0 || |
|
2654 |
sym.isLocal() || |
|
2655 |
sym.name == names._this || |
|
2656 |
sym.name == names._super) { |
|
2657 |
return; |
|
2658 |
} |
|
2659 |
} |
|
2660 |
||
2661 |
if (!types.isSubtype(sym.owner.type, syms.serializableType) && |
|
41629 | 2662 |
isEffectivelyNonPublic(sym)) { |
2663 |
if (isLambda) { |
|
2664 |
if (belongsToRestrictedPackage(sym)) { |
|
2665 |
log.warning(LintCategory.SERIAL, tree.pos(), |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2666 |
Warnings.AccessToMemberFromSerializableLambda(sym)); |
41629 | 2667 |
} |
2668 |
} else { |
|
2669 |
log.warning(tree.pos(), |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2670 |
Warnings.AccessToMemberFromSerializableElement(sym)); |
41629 | 2671 |
} |
24219 | 2672 |
} |
2673 |
} |
|
2674 |
} |
|
2675 |
||
2676 |
private boolean isEffectivelyNonPublic(Symbol sym) { |
|
2677 |
if (sym.packge() == syms.rootPackage) { |
|
2678 |
return false; |
|
2679 |
} |
|
2680 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
25874
diff
changeset
|
2681 |
while (sym.kind != PCK) { |
24219 | 2682 |
if ((sym.flags() & PUBLIC) == 0) { |
2683 |
return true; |
|
2684 |
} |
|
2685 |
sym = sym.owner; |
|
2686 |
} |
|
2687 |
return false; |
|
2688 |
} |
|
2689 |
||
41629 | 2690 |
private boolean belongsToRestrictedPackage(Symbol sym) { |
2691 |
String fullName = sym.packge().fullname.toString(); |
|
2692 |
return fullName.startsWith("java.") || |
|
2693 |
fullName.startsWith("javax.") || |
|
2694 |
fullName.startsWith("sun.") || |
|
2695 |
fullName.contains(".internal."); |
|
2696 |
} |
|
2697 |
||
10 | 2698 |
/** Check that class c does not implement directly or indirectly |
2699 |
* the same parameterized interface with two different argument lists. |
|
2700 |
* @param pos Position to be used for error reporting. |
|
2701 |
* @param type The type whose interfaces are checked. |
|
2702 |
*/ |
|
2703 |
void checkClassBounds(DiagnosticPosition pos, Type type) { |
|
22165
ec53c8946fc2
8030807: langtools should still build using jdk 7
vromero
parents:
22163
diff
changeset
|
2704 |
checkClassBounds(pos, new HashMap<TypeSymbol,Type>(), type); |
10 | 2705 |
} |
2706 |
//where |
|
2707 |
/** Enter all interfaces of type `type' into the hash table `seensofar' |
|
2708 |
* with their class symbol as key and their type as value. Make |
|
2709 |
* sure no class is entered with two different types. |
|
2710 |
*/ |
|
2711 |
void checkClassBounds(DiagnosticPosition pos, |
|
2712 |
Map<TypeSymbol,Type> seensofar, |
|
2713 |
Type type) { |
|
2714 |
if (type.isErroneous()) return; |
|
2715 |
for (List<Type> l = types.interfaces(type); l.nonEmpty(); l = l.tail) { |
|
2716 |
Type it = l.head; |
|
53390
46db9786cd67
8214345: infinite recursion while checking super class
bsrbnd
parents:
53037
diff
changeset
|
2717 |
if (type.hasTag(CLASS) && !it.hasTag(CLASS)) continue; // JLS 8.1.5 |
46db9786cd67
8214345: infinite recursion while checking super class
bsrbnd
parents:
53037
diff
changeset
|
2718 |
|
10 | 2719 |
Type oldit = seensofar.put(it.tsym, it); |
2720 |
if (oldit != null) { |
|
2721 |
List<Type> oldparams = oldit.allparams(); |
|
2722 |
List<Type> newparams = it.allparams(); |
|
2723 |
if (!types.containsTypeEquivalent(oldparams, newparams)) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2724 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2725 |
Errors.CantInheritDiffArg(it.tsym, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2726 |
Type.toString(oldparams), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2727 |
Type.toString(newparams))); |
10 | 2728 |
} |
2729 |
checkClassBounds(pos, seensofar, it); |
|
2730 |
} |
|
2731 |
Type st = types.supertype(type); |
|
53390
46db9786cd67
8214345: infinite recursion while checking super class
bsrbnd
parents:
53037
diff
changeset
|
2732 |
if (type.hasTag(CLASS) && !st.hasTag(CLASS)) return; // JLS 8.1.4 |
25276
59c17f73fee3
8034147: javac crashes with a NullPointerException during bounds checking
dlsmith
parents:
24903
diff
changeset
|
2733 |
if (st != Type.noType) checkClassBounds(pos, seensofar, st); |
10 | 2734 |
} |
2735 |
||
2736 |
/** Enter interface into into set. |
|
2737 |
* If it existed already, issue a "repeated interface" error. |
|
2738 |
*/ |
|
2739 |
void checkNotRepeated(DiagnosticPosition pos, Type it, Set<Type> its) { |
|
2740 |
if (its.contains(it)) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2741 |
log.error(pos, Errors.RepeatedInterface); |
10 | 2742 |
else { |
2743 |
its.add(it); |
|
2744 |
} |
|
2745 |
} |
|
2746 |
||
2747 |
/* ************************************************************************* |
|
2748 |
* Check annotations |
|
2749 |
**************************************************************************/ |
|
2750 |
||
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2751 |
/** |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2752 |
* Recursively validate annotations values |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2753 |
*/ |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2754 |
void validateAnnotationTree(JCTree tree) { |
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2755 |
class AnnotationValidator extends TreeScanner { |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2756 |
@Override |
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2757 |
public void visitAnnotation(JCAnnotation tree) { |
52777
7d3391e9df19
8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents:
51047
diff
changeset
|
2758 |
if (!tree.type.isErroneous() && tree.type.tsym.isAnnotationType()) { |
9814
978b696e85ad
7042623: Regression: javac silently crash when attributing non-existent annotation
jjg
parents:
9812
diff
changeset
|
2759 |
super.visitAnnotation(tree); |
978b696e85ad
7042623: Regression: javac silently crash when attributing non-existent annotation
jjg
parents:
9812
diff
changeset
|
2760 |
validateAnnotation(tree); |
978b696e85ad
7042623: Regression: javac silently crash when attributing non-existent annotation
jjg
parents:
9812
diff
changeset
|
2761 |
} |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2762 |
} |
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2763 |
} |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2764 |
tree.accept(new AnnotationValidator()); |
6342
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2765 |
} |
228b73431edb
6881115: javac permits nested anno w/o mandatory attrs => IncompleteAnnotationException
mcimadamore
parents:
6151
diff
changeset
|
2766 |
|
13844 | 2767 |
/** |
2768 |
* {@literal |
|
2769 |
* Annotation types are restricted to primitives, String, an |
|
10 | 2770 |
* enum, an annotation, Class, Class<?>, Class<? extends |
2771 |
* Anything>, arrays of the preceding. |
|
13844 | 2772 |
* } |
10 | 2773 |
*/ |
2774 |
void validateAnnotationType(JCTree restype) { |
|
2775 |
// restype may be null if an error occurred, so don't bother validating it |
|
2776 |
if (restype != null) { |
|
2777 |
validateAnnotationType(restype.pos(), restype.type); |
|
2778 |
} |
|
2779 |
} |
|
2780 |
||
2781 |
void validateAnnotationType(DiagnosticPosition pos, Type type) { |
|
2782 |
if (type.isPrimitive()) return; |
|
2783 |
if (types.isSameType(type, syms.stringType)) return; |
|
2784 |
if ((type.tsym.flags() & Flags.ENUM) != 0) return; |
|
2785 |
if ((type.tsym.flags() & Flags.ANNOTATION) != 0) return; |
|
24293
0d889f759fac
8033718: Inference ignores capture variable as upper bound
dlsmith
parents:
24226
diff
changeset
|
2786 |
if (types.cvarLowerBound(type).tsym == syms.classType.tsym) return; |
10 | 2787 |
if (types.isArray(type) && !types.isArray(types.elemtype(type))) { |
2788 |
validateAnnotationType(pos, types.elemtype(type)); |
|
2789 |
return; |
|
2790 |
} |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2791 |
log.error(pos, Errors.InvalidAnnotationMemberType); |
10 | 2792 |
} |
2793 |
||
2794 |
/** |
|
2795 |
* "It is also a compile-time error if any method declared in an |
|
2796 |
* annotation type has a signature that is override-equivalent to |
|
2797 |
* that of any public or protected method declared in class Object |
|
2798 |
* or in the interface annotation.Annotation." |
|
2799 |
* |
|
9303
eae35c201e19
7032975: API files in javax.annotation.processing need to be updated for references to JLS
jjh
parents:
9073
diff
changeset
|
2800 |
* @jls 9.6 Annotation Types |
10 | 2801 |
*/ |
2802 |
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
|
2803 |
for (Type sup = syms.annotationType; sup.hasTag(CLASS); sup = types.supertype(sup)) { |
10 | 2804 |
Scope s = sup.tsym.members(); |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2805 |
for (Symbol sym : s.getSymbolsByName(m.name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2806 |
if (sym.kind == MTH && |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2807 |
(sym.flags() & (PUBLIC | PROTECTED)) != 0 && |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2808 |
types.overrideEquivalent(m.type, sym.type)) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2809 |
log.error(pos, Errors.IntfAnnotationMemberClash(sym, sup)); |
10 | 2810 |
} |
2811 |
} |
|
2812 |
} |
|
2813 |
||
2814 |
/** Check the annotations of a symbol. |
|
2815 |
*/ |
|
2816 |
public void validateAnnotations(List<JCAnnotation> annotations, Symbol s) { |
|
2817 |
for (JCAnnotation a : annotations) |
|
2818 |
validateAnnotation(a, s); |
|
2819 |
} |
|
2820 |
||
15385 | 2821 |
/** Check the type annotations. |
2822 |
*/ |
|
2823 |
public void validateTypeAnnotations(List<JCAnnotation> annotations, boolean isTypeParameter) { |
|
2824 |
for (JCAnnotation a : annotations) |
|
2825 |
validateTypeAnnotation(a, isTypeParameter); |
|
2826 |
} |
|
2827 |
||
10 | 2828 |
/** Check an annotation of a symbol. |
2829 |
*/ |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2830 |
private void validateAnnotation(JCAnnotation a, Symbol s) { |
6347
947437d52cc1
6976649: javac does not enforce required annotation elements in arrays
mcimadamore
parents:
6345
diff
changeset
|
2831 |
validateAnnotationTree(a); |
10 | 2832 |
|
43279
9afb33b0a3ab
8171322: AssertionError in TypeSymbol.getAnnotationTypeMetadata.
sadayapalam
parents:
43139
diff
changeset
|
2833 |
if (a.type.tsym.isAnnotationType() && !annotationApplicable(a, s)) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2834 |
log.error(a.pos(), Errors.AnnotationTypeNotApplicable); |
10 | 2835 |
|
15361
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2836 |
if (a.annotationType.type.tsym == syms.functionalInterfaceType.tsym) { |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2837 |
if (s.kind != TYP) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2838 |
log.error(a.pos(), Errors.BadFunctionalIntfAnno); |
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
2839 |
} else if (!s.isInterface() || (s.flags() & ANNOTATION) != 0) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2840 |
log.error(a.pos(), Errors.BadFunctionalIntfAnno1(Fragments.NotAFunctionalIntf(s))); |
15361
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2841 |
} |
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15360
diff
changeset
|
2842 |
} |
10 | 2843 |
} |
2844 |
||
15385 | 2845 |
public void validateTypeAnnotation(JCAnnotation a, boolean isTypeParameter) { |
25848
3bc09f4676a9
8043643: Add an crules analyzer avoiding string concatenation in messages of Assert checks.
jlahoda
parents:
25445
diff
changeset
|
2846 |
Assert.checkNonNull(a.type); |
15385 | 2847 |
validateAnnotationTree(a); |
2848 |
||
21041 | 2849 |
if (a.hasTag(TYPE_ANNOTATION) && |
2850 |
!a.annotationType.type.isErroneous() && |
|
2851 |
!isTypeAnnotation(a, isTypeParameter)) { |
|
29959
61bfc66866da
8073534: Confusing / incorrect error message regarding annotations on non-declarations
alundblad
parents:
29842
diff
changeset
|
2852 |
log.error(a.pos(), Errors.AnnotationTypeNotApplicableToType(a.type)); |
21041 | 2853 |
} |
15385 | 2854 |
} |
2855 |
||
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2856 |
/** |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2857 |
* Validate the proposed container 'repeatable' on the |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2858 |
* annotation type symbol 's'. Report errors at position |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2859 |
* 'pos'. |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2860 |
* |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2861 |
* @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
|
2862 |
* @param repeatable the @Repeatable on 's' |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2863 |
* @param pos where to report errors |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2864 |
*/ |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2865 |
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
|
2866 |
Assert.check(types.isSameType(repeatable.type, syms.repeatableType)); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2867 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2868 |
Type t = null; |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2869 |
List<Pair<MethodSymbol,Attribute>> l = repeatable.values; |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2870 |
if (!l.isEmpty()) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2871 |
Assert.check(l.head.fst.name == names.value); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2872 |
t = ((Attribute.Class)l.head.snd).getValue(); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2873 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2874 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2875 |
if (t == null) { |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2876 |
// errors should already have been reported during Annotate |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2877 |
return; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2878 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2879 |
|
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2880 |
validateValue(t.tsym, s, pos); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2881 |
validateRetention(t.tsym, s, pos); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2882 |
validateDocumented(t.tsym, s, pos); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2883 |
validateInherited(t.tsym, s, pos); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2884 |
validateTarget(t.tsym, s, pos); |
22688
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
2885 |
validateDefault(t.tsym, pos); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2886 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2887 |
|
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2888 |
private void validateValue(TypeSymbol container, TypeSymbol contained, DiagnosticPosition pos) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2889 |
Symbol sym = container.members().findFirst(names.value); |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2890 |
if (sym != null && sym.kind == MTH) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
2891 |
MethodSymbol m = (MethodSymbol) sym; |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2892 |
Type ret = m.getReturnType(); |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2893 |
if (!(ret.hasTag(ARRAY) && types.isSameType(((ArrayType)ret).elemtype, contained.type))) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2894 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2895 |
Errors.InvalidRepeatableAnnotationValueReturn(container, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2896 |
ret, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2897 |
types.makeArrayType(contained.type))); |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2898 |
} |
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14804
diff
changeset
|
2899 |
} else { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2900 |
log.error(pos, Errors.InvalidRepeatableAnnotationNoValue(container)); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2901 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2902 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2903 |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
2904 |
private void validateRetention(TypeSymbol container, TypeSymbol contained, DiagnosticPosition pos) { |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2905 |
Attribute.RetentionPolicy containerRetention = types.getRetention(container); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2906 |
Attribute.RetentionPolicy containedRetention = types.getRetention(contained); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2907 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2908 |
boolean error = false; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2909 |
switch (containedRetention) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2910 |
case RUNTIME: |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2911 |
if (containerRetention != Attribute.RetentionPolicy.RUNTIME) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2912 |
error = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2913 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2914 |
break; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2915 |
case CLASS: |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2916 |
if (containerRetention == Attribute.RetentionPolicy.SOURCE) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2917 |
error = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2918 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2919 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2920 |
if (error ) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2921 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2922 |
Errors.InvalidRepeatableAnnotationRetention(container, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2923 |
containerRetention.name(), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2924 |
contained, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2925 |
containedRetention.name())); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2926 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2927 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2928 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2929 |
private void validateDocumented(Symbol container, Symbol contained, DiagnosticPosition pos) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2930 |
if (contained.attribute(syms.documentedType.tsym) != null) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2931 |
if (container.attribute(syms.documentedType.tsym) == null) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2932 |
log.error(pos, Errors.InvalidRepeatableAnnotationNotDocumented(container, contained)); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2933 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2934 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2935 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2936 |
|
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2937 |
private void validateInherited(Symbol container, Symbol contained, DiagnosticPosition pos) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2938 |
if (contained.attribute(syms.inheritedType.tsym) != null) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2939 |
if (container.attribute(syms.inheritedType.tsym) == null) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2940 |
log.error(pos, Errors.InvalidRepeatableAnnotationNotInherited(container, contained)); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2941 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2942 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2943 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2944 |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
2945 |
private void validateTarget(TypeSymbol container, TypeSymbol 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
|
2946 |
// 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
|
2947 |
// (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
|
2948 |
// 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
|
2949 |
// explicit. |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2950 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2951 |
Set<Name> containerTargets; |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2952 |
Attribute.Array containerTarget = getAttributeTargetAttribute(container); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2953 |
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
|
2954 |
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
|
2955 |
} else { |
22163 | 2956 |
containerTargets = new HashSet<>(); |
2957 |
for (Attribute app : containerTarget.values) { |
|
2958 |
if (!(app instanceof Attribute.Enum)) { |
|
2959 |
continue; // recovery |
|
2960 |
} |
|
2961 |
Attribute.Enum e = (Attribute.Enum)app; |
|
2962 |
containerTargets.add(e.value.name); |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2963 |
} |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2964 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2965 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2966 |
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
|
2967 |
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
|
2968 |
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
|
2969 |
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
|
2970 |
} else { |
22163 | 2971 |
containedTargets = new HashSet<>(); |
2972 |
for (Attribute app : containedTarget.values) { |
|
2973 |
if (!(app instanceof Attribute.Enum)) { |
|
2974 |
continue; // recovery |
|
2975 |
} |
|
2976 |
Attribute.Enum e = (Attribute.Enum)app; |
|
2977 |
containedTargets.add(e.value.name); |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2978 |
} |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2979 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2980 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2981 |
if (!isTargetSubsetOf(containerTargets, containedTargets)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
2982 |
log.error(pos, Errors.InvalidRepeatableAnnotationIncompatibleTarget(container, contained)); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2983 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2984 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
2985 |
|
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2986 |
/* 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
|
2987 |
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
|
2988 |
if (defaultTargets == null) { |
22163 | 2989 |
Set<Name> targets = new HashSet<>(); |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2990 |
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
|
2991 |
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
|
2992 |
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
|
2993 |
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
|
2994 |
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
|
2995 |
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
|
2996 |
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
|
2997 |
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
|
2998 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
2999 |
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
|
3000 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
3001 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
3002 |
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
|
3003 |
} |
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
3004 |
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
|
3005 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
3006 |
|
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
3007 |
/** Checks that s is a subset of t, with respect to ElementType |
22688
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3008 |
* semantics, specifically {ANNOTATION_TYPE} is a subset of {TYPE}, |
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3009 |
* and {TYPE_USE} covers the set {ANNOTATION_TYPE, TYPE, TYPE_USE, |
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3010 |
* TYPE_PARAMETER}. |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3011 |
*/ |
16546
49a9c3f37e64
8006547: Repeating annotations: No Target on container annotation with all targets on base annotation gives compiler error
jfranck
parents:
16340
diff
changeset
|
3012 |
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
|
3013 |
// 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
|
3014 |
for (Name n2 : s) { |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3015 |
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
|
3016 |
for (Name n1 : t) { |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3017 |
if (n1 == n2) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3018 |
currentElementOk = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3019 |
break; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3020 |
} else if (n1 == names.TYPE && n2 == names.ANNOTATION_TYPE) { |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3021 |
currentElementOk = true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3022 |
break; |
22688
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3023 |
} else if (n1 == names.TYPE_USE && |
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3024 |
(n2 == names.TYPE || |
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3025 |
n2 == names.ANNOTATION_TYPE || |
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3026 |
n2 == names.TYPE_PARAMETER)) { |
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3027 |
currentElementOk = true; |
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3028 |
break; |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3029 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3030 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3031 |
if (!currentElementOk) |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3032 |
return false; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3033 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3034 |
return true; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3035 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3036 |
|
22688
304eb013ac63
8029017: ElementType.TYPE_USE should be a logical superset of ElementType.TYPE and ANNOTATION_TYPE
jfranck
parents:
22165
diff
changeset
|
3037 |
private void validateDefault(Symbol container, DiagnosticPosition pos) { |
14054
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3038 |
// 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
|
3039 |
Scope scope = container.members(); |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3040 |
for(Symbol elm : scope.getSymbols()) { |
14054
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3041 |
if (elm.name != names.value && |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
25874
diff
changeset
|
3042 |
elm.kind == MTH && |
14054
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3043 |
((MethodSymbol)elm).defaultValue == null) { |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3044 |
log.error(pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3045 |
Errors.InvalidRepeatableAnnotationElemNondefault(container, elm)); |
14054
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3046 |
} |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3047 |
} |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3048 |
} |
7ae16dd77c90
7199925: Separate compilation breaks check that elements have a default for the containing annotation
jfranck
parents:
14047
diff
changeset
|
3049 |
|
10 | 3050 |
/** Is s a method symbol that overrides a method in a superclass? */ |
3051 |
boolean isOverrider(Symbol s) { |
|
3052 |
if (s.kind != MTH || s.isStatic()) |
|
3053 |
return false; |
|
3054 |
MethodSymbol m = (MethodSymbol)s; |
|
3055 |
TypeSymbol owner = (TypeSymbol)m.owner; |
|
3056 |
for (Type sup : types.closure(owner.type)) { |
|
3057 |
if (sup == owner.type) |
|
3058 |
continue; // skip "this" |
|
3059 |
Scope scope = sup.tsym.members(); |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3060 |
for (Symbol sym : scope.getSymbolsByName(m.name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3061 |
if (!sym.isStatic() && m.overrides(sym, owner, types, true)) |
10 | 3062 |
return true; |
3063 |
} |
|
3064 |
} |
|
3065 |
return false; |
|
3066 |
} |
|
3067 |
||
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3068 |
/** Is the annotation applicable to types? */ |
15385 | 3069 |
protected boolean isTypeAnnotation(JCAnnotation a, boolean isTypeParameter) { |
30069
5686d5e44a83
8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents:
30066
diff
changeset
|
3070 |
List<Attribute> targets = typeAnnotations.annotationTargets(a.annotationType.type.tsym); |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3071 |
return (targets == null) ? |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3072 |
false : |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3073 |
targets.stream() |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3074 |
.anyMatch(attr -> isTypeAnnotation(attr, isTypeParameter)); |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3075 |
} |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3076 |
//where |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3077 |
boolean isTypeAnnotation(Attribute a, boolean isTypeParameter) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3078 |
Attribute.Enum e = (Attribute.Enum)a; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3079 |
return (e.value.name == names.TYPE_USE || |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3080 |
(isTypeParameter && e.value.name == names.TYPE_PARAMETER)); |
15385 | 3081 |
} |
3082 |
||
10 | 3083 |
/** Is the annotation applicable to the symbol? */ |
3084 |
boolean annotationApplicable(JCAnnotation a, Symbol s) { |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3085 |
Attribute.Array arr = getAttributeTargetAttribute(a.annotationType.type.tsym); |
15385 | 3086 |
Name[] targets; |
22003
ed437c411fbd
8028699: Compiler crash during speculative attribution of annotated type
jlahoda
parents:
21896
diff
changeset
|
3087 |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3088 |
if (arr == null) { |
15385 | 3089 |
targets = defaultTargetMetaInfo(a, s); |
3090 |
} else { |
|
3091 |
// TODO: can we optimize this? |
|
3092 |
targets = new Name[arr.values.length]; |
|
3093 |
for (int i=0; i<arr.values.length; ++i) { |
|
3094 |
Attribute app = arr.values[i]; |
|
3095 |
if (!(app instanceof Attribute.Enum)) { |
|
3096 |
return true; // recovery |
|
3097 |
} |
|
3098 |
Attribute.Enum e = (Attribute.Enum) app; |
|
3099 |
targets[i] = e.value.name; |
|
3100 |
} |
|
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3101 |
} |
15385 | 3102 |
for (Name target : targets) { |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3103 |
if (target == names.TYPE) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3104 |
if (s.kind == TYP) |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3105 |
return true; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3106 |
} else if (target == names.FIELD) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3107 |
if (s.kind == VAR && s.owner.kind != MTH) |
10 | 3108 |
return true; |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3109 |
} else if (target == names.METHOD) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3110 |
if (s.kind == MTH && !s.isConstructor()) |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3111 |
return true; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3112 |
} else if (target == names.PARAMETER) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3113 |
if (s.kind == VAR && s.owner.kind == MTH && |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3114 |
(s.flags() & PARAMETER) != 0) { |
10 | 3115 |
return true; |
3116 |
} |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3117 |
} else if (target == names.CONSTRUCTOR) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3118 |
if (s.kind == MTH && s.isConstructor()) |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3119 |
return true; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3120 |
} else if (target == names.LOCAL_VARIABLE) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3121 |
if (s.kind == VAR && s.owner.kind == MTH && |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3122 |
(s.flags() & PARAMETER) == 0) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3123 |
return true; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3124 |
} |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3125 |
} else if (target == names.ANNOTATION_TYPE) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3126 |
if (s.kind == TYP && (s.flags() & ANNOTATION) != 0) { |
10 | 3127 |
return true; |
3128 |
} |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3129 |
} else if (target == names.PACKAGE) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3130 |
if (s.kind == PCK) |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3131 |
return true; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3132 |
} else if (target == names.TYPE_USE) { |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
3133 |
if (s.kind == VAR && s.owner.kind == MTH && s.type.hasTag(NONE)) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
3134 |
//cannot type annotate implictly typed locals |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
3135 |
return false; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47248
diff
changeset
|
3136 |
} else if (s.kind == TYP || s.kind == VAR || |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3137 |
(s.kind == MTH && !s.isConstructor() && |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3138 |
!s.type.getReturnType().hasTag(VOID)) || |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3139 |
(s.kind == MTH && s.isConstructor())) { |
15385 | 3140 |
return true; |
3141 |
} |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3142 |
} else if (target == names.TYPE_PARAMETER) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3143 |
if (s.kind == TYP && s.type.hasTag(TYPEVAR)) |
3149 | 3144 |
return true; |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3145 |
} else |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3146 |
return true; // Unknown ElementType. This should be an error at declaration site, |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3147 |
// assume applicable. |
10 | 3148 |
} |
3149 |
return false; |
|
3150 |
} |
|
3151 |
||
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3152 |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3153 |
Attribute.Array getAttributeTargetAttribute(TypeSymbol s) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3154 |
Attribute.Compound atTarget = s.getAnnotationTypeMetadata().getTarget(); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3155 |
if (atTarget == null) return null; // ok, is applicable |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3156 |
Attribute atValue = atTarget.member(names.value); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3157 |
if (!(atValue instanceof Attribute.Array)) return null; // error recovery |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3158 |
return (Attribute.Array) atValue; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3159 |
} |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
13438
diff
changeset
|
3160 |
|
15385 | 3161 |
private final Name[] dfltTargetMeta; |
3162 |
private Name[] defaultTargetMetaInfo(JCAnnotation a, Symbol s) { |
|
3163 |
return dfltTargetMeta; |
|
3164 |
} |
|
3165 |
||
10 | 3166 |
/** Check an annotation value. |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3167 |
* |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3168 |
* @param a The annotation tree to check |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3169 |
* @return true if this annotation tree is valid, otherwise false |
10 | 3170 |
*/ |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3171 |
public boolean validateAnnotationDeferErrors(JCAnnotation a) { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3172 |
boolean res = false; |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3173 |
final Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log); |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3174 |
try { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3175 |
res = validateAnnotation(a); |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3176 |
} finally { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3177 |
log.popDiagnosticHandler(diagHandler); |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3178 |
} |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3179 |
return res; |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3180 |
} |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3181 |
|
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3182 |
private boolean validateAnnotation(JCAnnotation a) { |
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3183 |
boolean isValid = true; |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3184 |
AnnotationTypeMetadata metadata = a.annotationType.type.tsym.getAnnotationTypeMetadata(); |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3185 |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3186 |
// collect an inventory of the annotation elements |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3187 |
Set<MethodSymbol> elements = metadata.getAnnotationElements(); |
10 | 3188 |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3189 |
// remove the ones that are assigned values |
10 | 3190 |
for (JCTree arg : a.args) { |
10950 | 3191 |
if (!arg.hasTag(ASSIGN)) continue; // recovery |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3192 |
JCAssign assign = (JCAssign)arg; |
10 | 3193 |
Symbol m = TreeInfo.symbol(assign.lhs); |
3194 |
if (m == null || m.type.isErroneous()) continue; |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3195 |
if (!elements.remove(m)) { |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3196 |
isValid = false; |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3197 |
log.error(assign.lhs.pos(), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3198 |
Errors.DuplicateAnnotationMemberValue(m.name, a.type)); |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3199 |
} |
10 | 3200 |
} |
3201 |
||
3202 |
// all the remaining ones better have default values |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3203 |
List<Name> missingDefaults = List.nil(); |
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3204 |
Set<MethodSymbol> membersWithDefault = metadata.getAnnotationElementsWithDefault(); |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3205 |
for (MethodSymbol m : elements) { |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3206 |
if (m.type.isErroneous()) |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3207 |
continue; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3208 |
|
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3209 |
if (!membersWithDefault.contains(m)) |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3210 |
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
|
3211 |
} |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3212 |
missingDefaults = missingDefaults.reverse(); |
6345
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3213 |
if (missingDefaults.nonEmpty()) { |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3214 |
isValid = false; |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
3215 |
Error errorKey = (missingDefaults.size() > 1) |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
3216 |
? Errors.AnnotationMissingDefaultValue1(a.type, missingDefaults) |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
3217 |
: Errors.AnnotationMissingDefaultValue(a.type, missingDefaults); |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
3218 |
log.error(a.pos(), errorKey); |
6345
7d98c298aafd
6975231: Regression test for 6881115 is failing with compiler output not matching expected output
mcimadamore
parents:
6342
diff
changeset
|
3219 |
} |
10 | 3220 |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3221 |
return isValid && validateTargetAnnotationValue(a); |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3222 |
} |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3223 |
|
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3224 |
/* Validate the special java.lang.annotation.Target annotation */ |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3225 |
boolean validateTargetAnnotationValue(JCAnnotation a) { |
10 | 3226 |
// special case: java.lang.annotation.Target must not have |
3227 |
// repeated values in its value member |
|
3228 |
if (a.annotationType.type.tsym != syms.annotationTargetType.tsym || |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3229 |
a.args.tail == null) |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3230 |
return true; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3231 |
|
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
29776
diff
changeset
|
3232 |
boolean isValid = true; |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3233 |
if (!a.args.head.hasTag(ASSIGN)) return false; // error recovery |
10 | 3234 |
JCAssign assign = (JCAssign) a.args.head; |
3235 |
Symbol m = TreeInfo.symbol(assign.lhs); |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3236 |
if (m.name != names.value) return false; |
10 | 3237 |
JCTree rhs = assign.rhs; |
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3238 |
if (!rhs.hasTag(NEWARRAY)) return false; |
10 | 3239 |
JCNewArray na = (JCNewArray) rhs; |
22163 | 3240 |
Set<Symbol> targets = new HashSet<>(); |
10 | 3241 |
for (JCTree elem : na.elems) { |
3242 |
if (!targets.add(TreeInfo.symbol(elem))) { |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3243 |
isValid = false; |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3244 |
log.error(elem.pos(), Errors.RepeatedAnnotationTarget); |
10 | 3245 |
} |
3246 |
} |
|
14804
f93a8d60b9a4
8001114: Container annotation is not checked for semantic correctness
jfranck
parents:
14800
diff
changeset
|
3247 |
return isValid; |
10 | 3248 |
} |
3249 |
||
3250 |
void checkDeprecatedAnnotation(DiagnosticPosition pos, Symbol s) { |
|
40772
de87954b8f20
8164073: Javac should unconditionally warn if deprecated javadoc tag is used without @Deprecated annotation
sadayapalam
parents:
40504
diff
changeset
|
3251 |
if (lint.isEnabled(LintCategory.DEP_ANN) && s.isDeprecatableViaAnnotation() && |
10 | 3252 |
(s.flags() & DEPRECATED) != 0 && |
3253 |
!syms.deprecatedType.isErroneous() && |
|
3254 |
s.attribute(syms.deprecatedType.tsym) == null) { |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3255 |
log.warning(LintCategory.DEP_ANN, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3256 |
pos, Warnings.MissingDeprecatedAnnotation); |
10 | 3257 |
} |
40313
a85f92c9a8ab
8068626: Add javac lint warning when the @Deprecated annotation is used where it is a no-op
sadayapalam
parents:
39674
diff
changeset
|
3258 |
// Note: @Deprecated has no effect on local variables, parameters and package decls. |
40772
de87954b8f20
8164073: Javac should unconditionally warn if deprecated javadoc tag is used without @Deprecated annotation
sadayapalam
parents:
40504
diff
changeset
|
3259 |
if (lint.isEnabled(LintCategory.DEPRECATION) && !s.isDeprecatableViaAnnotation()) { |
40313
a85f92c9a8ab
8068626: Add javac lint warning when the @Deprecated annotation is used where it is a no-op
sadayapalam
parents:
39674
diff
changeset
|
3260 |
if (!syms.deprecatedType.isErroneous() && s.attribute(syms.deprecatedType.tsym) != null) { |
40772
de87954b8f20
8164073: Javac should unconditionally warn if deprecated javadoc tag is used without @Deprecated annotation
sadayapalam
parents:
40504
diff
changeset
|
3261 |
log.warning(LintCategory.DEPRECATION, pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3262 |
Warnings.DeprecatedAnnotationHasNoEffect(Kinds.kindName(s))); |
40313
a85f92c9a8ab
8068626: Add javac lint warning when the @Deprecated annotation is used where it is a no-op
sadayapalam
parents:
39674
diff
changeset
|
3263 |
} |
a85f92c9a8ab
8068626: Add javac lint warning when the @Deprecated annotation is used where it is a no-op
sadayapalam
parents:
39674
diff
changeset
|
3264 |
} |
10 | 3265 |
} |
3266 |
||
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3267 |
void checkDeprecated(final DiagnosticPosition pos, final Symbol other, final Symbol s) { |
53037
e84983c2735e
8215368: Make Check.checkOverride call diagnosticPositionFor lazily
cushon
parents:
52777
diff
changeset
|
3268 |
checkDeprecated(() -> pos, other, s); |
e84983c2735e
8215368: Make Check.checkOverride call diagnosticPositionFor lazily
cushon
parents:
52777
diff
changeset
|
3269 |
} |
e84983c2735e
8215368: Make Check.checkOverride call diagnosticPositionFor lazily
cushon
parents:
52777
diff
changeset
|
3270 |
|
e84983c2735e
8215368: Make Check.checkOverride call diagnosticPositionFor lazily
cushon
parents:
52777
diff
changeset
|
3271 |
void checkDeprecated(Supplier<DiagnosticPosition> pos, final Symbol other, final Symbol s) { |
41637 | 3272 |
if ( (s.isDeprecatedForRemoval() |
3273 |
|| s.isDeprecated() && !other.isDeprecated()) |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
3274 |
&& (s.outermostClass() != other.outermostClass() || s.outermostClass() == null)) { |
53037
e84983c2735e
8215368: Make Check.checkOverride call diagnosticPositionFor lazily
cushon
parents:
52777
diff
changeset
|
3275 |
deferredLintHandler.report(() -> warnDeprecated(pos.get(), s)); |
11314 | 3276 |
} |
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3277 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3278 |
|
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3279 |
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
|
3280 |
if ((s.flags() & PROPRIETARY) != 0) { |
35810 | 3281 |
deferredLintHandler.report(() -> { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3282 |
log.mandatoryWarning(pos, Warnings.SunProprietary(s)); |
8236
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3283 |
}); |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3284 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3285 |
} |
0d8646b7c602
6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents:
8229
diff
changeset
|
3286 |
|
15724 | 3287 |
void checkProfile(final DiagnosticPosition pos, final Symbol s) { |
3288 |
if (profile != Profile.DEFAULT && (s.flags() & NOT_IN_PROFILE) != 0) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3289 |
log.error(pos, Errors.NotInProfile(s, profile)); |
15724 | 3290 |
} |
3291 |
} |
|
3292 |
||
10 | 3293 |
/* ************************************************************************* |
3294 |
* Check for recursive annotation elements. |
|
3295 |
**************************************************************************/ |
|
3296 |
||
3297 |
/** Check for cycles in the graph of annotation elements. |
|
3298 |
*/ |
|
3299 |
void checkNonCyclicElements(JCClassDecl tree) { |
|
3300 |
if ((tree.sym.flags_field & ANNOTATION) == 0) return; |
|
8032 | 3301 |
Assert.check((tree.sym.flags_field & LOCKED) == 0); |
10 | 3302 |
try { |
3303 |
tree.sym.flags_field |= LOCKED; |
|
3304 |
for (JCTree def : tree.defs) { |
|
10950 | 3305 |
if (!def.hasTag(METHODDEF)) continue; |
10 | 3306 |
JCMethodDecl meth = (JCMethodDecl)def; |
3307 |
checkAnnotationResType(meth.pos(), meth.restype.type); |
|
3308 |
} |
|
3309 |
} finally { |
|
3310 |
tree.sym.flags_field &= ~LOCKED; |
|
3311 |
tree.sym.flags_field |= ACYCLIC_ANN; |
|
3312 |
} |
|
3313 |
} |
|
3314 |
||
3315 |
void checkNonCyclicElementsInternal(DiagnosticPosition pos, TypeSymbol tsym) { |
|
3316 |
if ((tsym.flags_field & ACYCLIC_ANN) != 0) |
|
3317 |
return; |
|
3318 |
if ((tsym.flags_field & LOCKED) != 0) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3319 |
log.error(pos, Errors.CyclicAnnotationElement(tsym)); |
10 | 3320 |
return; |
3321 |
} |
|
3322 |
try { |
|
3323 |
tsym.flags_field |= LOCKED; |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3324 |
for (Symbol s : tsym.members().getSymbols(NON_RECURSIVE)) { |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
25874
diff
changeset
|
3325 |
if (s.kind != MTH) |
10 | 3326 |
continue; |
3327 |
checkAnnotationResType(pos, ((MethodSymbol)s).type.getReturnType()); |
|
3328 |
} |
|
3329 |
} finally { |
|
3330 |
tsym.flags_field &= ~LOCKED; |
|
3331 |
tsym.flags_field |= ACYCLIC_ANN; |
|
3332 |
} |
|
3333 |
} |
|
3334 |
||
3335 |
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
|
3336 |
switch (type.getTag()) { |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3337 |
case CLASS: |
10 | 3338 |
if ((type.tsym.flags() & ANNOTATION) != 0) |
3339 |
checkNonCyclicElementsInternal(pos, type.tsym); |
|
3340 |
break; |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3341 |
case ARRAY: |
10 | 3342 |
checkAnnotationResType(pos, types.elemtype(type)); |
3343 |
break; |
|
3344 |
default: |
|
3345 |
break; // int etc |
|
3346 |
} |
|
3347 |
} |
|
3348 |
||
3349 |
/* ************************************************************************* |
|
3350 |
* Check for cycles in the constructor call graph. |
|
3351 |
**************************************************************************/ |
|
3352 |
||
3353 |
/** Check for cycles in the graph of constructors calling other |
|
3354 |
* constructors. |
|
3355 |
*/ |
|
3356 |
void checkCyclicConstructors(JCClassDecl tree) { |
|
22163 | 3357 |
Map<Symbol,Symbol> callMap = new HashMap<>(); |
10 | 3358 |
|
3359 |
// enter each constructor this-call into the map |
|
3360 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
|
3361 |
JCMethodInvocation app = TreeInfo.firstConstructorCall(l.head); |
|
3362 |
if (app == null) continue; |
|
3363 |
JCMethodDecl meth = (JCMethodDecl) l.head; |
|
3364 |
if (TreeInfo.name(app.meth) == names._this) { |
|
3365 |
callMap.put(meth.sym, TreeInfo.symbol(app.meth)); |
|
3366 |
} else { |
|
3367 |
meth.sym.flags_field |= ACYCLIC; |
|
3368 |
} |
|
3369 |
} |
|
3370 |
||
3371 |
// Check for cycles in the map |
|
3372 |
Symbol[] ctors = new Symbol[0]; |
|
3373 |
ctors = callMap.keySet().toArray(ctors); |
|
3374 |
for (Symbol caller : ctors) { |
|
3375 |
checkCyclicConstructor(tree, caller, callMap); |
|
3376 |
} |
|
3377 |
} |
|
3378 |
||
3379 |
/** Look in the map to see if the given constructor is part of a |
|
3380 |
* call cycle. |
|
3381 |
*/ |
|
3382 |
private void checkCyclicConstructor(JCClassDecl tree, Symbol ctor, |
|
3383 |
Map<Symbol,Symbol> callMap) { |
|
3384 |
if (ctor != null && (ctor.flags_field & ACYCLIC) == 0) { |
|
3385 |
if ((ctor.flags_field & LOCKED) != 0) { |
|
3386 |
log.error(TreeInfo.diagnosticPositionFor(ctor, tree), |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3387 |
Errors.RecursiveCtorInvocation); |
10 | 3388 |
} else { |
3389 |
ctor.flags_field |= LOCKED; |
|
3390 |
checkCyclicConstructor(tree, callMap.remove(ctor), callMap); |
|
3391 |
ctor.flags_field &= ~LOCKED; |
|
3392 |
} |
|
3393 |
ctor.flags_field |= ACYCLIC; |
|
3394 |
} |
|
3395 |
} |
|
3396 |
||
3397 |
/* ************************************************************************* |
|
3398 |
* Miscellaneous |
|
3399 |
**************************************************************************/ |
|
3400 |
||
3401 |
/** |
|
3402 |
* Check for division by integer constant zero |
|
3403 |
* @param pos Position for error reporting. |
|
3404 |
* @param operator The operator for the expression |
|
3405 |
* @param operand The right hand operand for the expression |
|
3406 |
*/ |
|
25301
e5da086c7d43
6707032: Division by zero warning not suppressed properly in some cases
jlahoda
parents:
25283
diff
changeset
|
3407 |
void checkDivZero(final DiagnosticPosition pos, Symbol operator, Type operand) { |
10 | 3408 |
if (operand.constValue() != null |
18395
d56a5fbf0b32
8016267: javac, TypeTag refactoring has provoked performance issues
vromero
parents:
18393
diff
changeset
|
3409 |
&& operand.getTag().isSubRangeOf(LONG) |
10 | 3410 |
&& ((Number) (operand.constValue())).longValue() == 0) { |
3411 |
int opc = ((OperatorSymbol)operator).opcode; |
|
3412 |
if (opc == ByteCodes.idiv || opc == ByteCodes.imod |
|
3413 |
|| opc == ByteCodes.ldiv || opc == ByteCodes.lmod) { |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
3414 |
deferredLintHandler.report(() -> warnDivZero(pos)); |
10 | 3415 |
} |
3416 |
} |
|
3417 |
} |
|
3418 |
||
3419 |
/** |
|
3420 |
* Check for empty statements after if |
|
3421 |
*/ |
|
3422 |
void checkEmptyIf(JCIf tree) { |
|
10950 | 3423 |
if (tree.thenpart.hasTag(SKIP) && tree.elsepart == null && |
3424 |
lint.isEnabled(LintCategory.EMPTY)) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3425 |
log.warning(LintCategory.EMPTY, tree.thenpart.pos(), Warnings.EmptyIf); |
10 | 3426 |
} |
3427 |
||
3428 |
/** Check that symbol is unique in given scope. |
|
3429 |
* @param pos Position for error reporting. |
|
3430 |
* @param sym The symbol. |
|
3431 |
* @param s The scope. |
|
3432 |
*/ |
|
3433 |
boolean checkUnique(DiagnosticPosition pos, Symbol sym, Scope s) { |
|
3434 |
if (sym.type.isErroneous()) |
|
3435 |
return true; |
|
3436 |
if (sym.owner.name == names.any) return false; |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3437 |
for (Symbol byName : s.getSymbolsByName(sym.name, NON_RECURSIVE)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3438 |
if (sym != byName && |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3439 |
(byName.flags() & CLASH) == 0 && |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3440 |
sym.kind == byName.kind && |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3441 |
sym.name != names.error && |
19938
a2ac24fff52e
8013846: javac fails to reject semantically equivalent generic method declarations
emc
parents:
19930
diff
changeset
|
3442 |
(sym.kind != MTH || |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3443 |
types.hasSameArgs(sym.type, byName.type) || |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3444 |
types.hasSameArgs(types.erasure(sym.type), types.erasure(byName.type)))) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3445 |
if ((sym.flags() & VARARGS) != (byName.flags() & VARARGS)) { |
48459
a5f815d1060b
8194932: no ambuguity error is emitted if classfile contains two identical methods with different return types
mcimadamore
parents:
48352
diff
changeset
|
3446 |
sym.flags_field |= CLASH; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3447 |
varargsDuplicateError(pos, sym, byName); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3448 |
return true; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3449 |
} else if (sym.kind == MTH && !types.hasSameArgs(sym.type, byName.type, false)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3450 |
duplicateErasureError(pos, sym, byName); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3451 |
sym.flags_field |= CLASH; |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3452 |
return true; |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3453 |
} else { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3454 |
duplicateError(pos, byName); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3455 |
return false; |
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3456 |
} |
10 | 3457 |
} |
3458 |
} |
|
3459 |
return true; |
|
3460 |
} |
|
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3461 |
|
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3462 |
/** Report duplicate declaration error. |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3463 |
*/ |
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3464 |
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
|
3465 |
if (!sym1.type.isErroneous() && !sym2.type.isErroneous()) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3466 |
log.error(pos, Errors.NameClashSameErasure(sym1, sym2)); |
8228
4e6ee38974b2
6910550: javac 1.5.0_17 fails with incorrect error message
mcimadamore
parents:
8045
diff
changeset
|
3467 |
} |
8242
3873b4aaf4a8
7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents:
8238
diff
changeset
|
3468 |
} |
10 | 3469 |
|
27857 | 3470 |
/**Check that types imported through the ordinary imports don't clash with types imported |
3471 |
* by other (static or ordinary) imports. Note that two static imports may import two clashing |
|
3472 |
* types without an error on the imports. |
|
3473 |
* @param toplevel The toplevel tree for which the test should be performed. |
|
10 | 3474 |
*/ |
27857 | 3475 |
void checkImportsUnique(JCCompilationUnit toplevel) { |
3476 |
WriteableScope ordinallyImportedSoFar = WriteableScope.create(toplevel.packge); |
|
3477 |
WriteableScope staticallyImportedSoFar = WriteableScope.create(toplevel.packge); |
|
3478 |
WriteableScope topLevelScope = toplevel.toplevelScope; |
|
3479 |
||
3480 |
for (JCTree def : toplevel.defs) { |
|
3481 |
if (!def.hasTag(IMPORT)) |
|
3482 |
continue; |
|
3483 |
||
3484 |
JCImport imp = (JCImport) def; |
|
3485 |
||
3486 |
if (imp.importScope == null) |
|
3487 |
continue; |
|
3488 |
||
3489 |
for (Symbol sym : imp.importScope.getSymbols(sym -> sym.kind == TYP)) { |
|
3490 |
if (imp.isStatic()) { |
|
3491 |
checkUniqueImport(imp.pos(), ordinallyImportedSoFar, staticallyImportedSoFar, topLevelScope, sym, true); |
|
3492 |
staticallyImportedSoFar.enter(sym); |
|
3493 |
} else { |
|
3494 |
checkUniqueImport(imp.pos(), ordinallyImportedSoFar, staticallyImportedSoFar, topLevelScope, sym, false); |
|
3495 |
ordinallyImportedSoFar.enter(sym); |
|
3496 |
} |
|
3497 |
} |
|
3498 |
||
3499 |
imp.importScope = null; |
|
3500 |
} |
|
10 | 3501 |
} |
3502 |
||
3503 |
/** Check that single-type import is not already imported or top-level defined, |
|
3504 |
* but make an exception for two single-type imports which denote the same type. |
|
27857 | 3505 |
* @param pos Position for error reporting. |
3506 |
* @param ordinallyImportedSoFar A Scope containing types imported so far through |
|
3507 |
* ordinary imports. |
|
3508 |
* @param staticallyImportedSoFar A Scope containing types imported so far through |
|
3509 |
* static imports. |
|
3510 |
* @param topLevelScope The current file's top-level Scope |
|
3511 |
* @param sym The symbol. |
|
3512 |
* @param staticImport Whether or not this was a static import |
|
10 | 3513 |
*/ |
27857 | 3514 |
private boolean checkUniqueImport(DiagnosticPosition pos, Scope ordinallyImportedSoFar, |
3515 |
Scope staticallyImportedSoFar, Scope topLevelScope, |
|
3516 |
Symbol sym, boolean staticImport) { |
|
3517 |
Filter<Symbol> duplicates = candidate -> candidate != sym && !candidate.type.isErroneous(); |
|
47948
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3518 |
Symbol ordinaryClashing = ordinallyImportedSoFar.findFirst(sym.name, duplicates); |
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3519 |
Symbol staticClashing = null; |
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3520 |
if (ordinaryClashing == null && !staticImport) { |
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3521 |
staticClashing = staticallyImportedSoFar.findFirst(sym.name, duplicates); |
27857 | 3522 |
} |
47948
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3523 |
if (ordinaryClashing != null || staticClashing != null) { |
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3524 |
if (ordinaryClashing != null) |
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3525 |
log.error(pos, Errors.AlreadyDefinedSingleImport(ordinaryClashing)); |
27857 | 3526 |
else |
47948
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3527 |
log.error(pos, Errors.AlreadyDefinedStaticSingleImport(staticClashing)); |
27857 | 3528 |
return false; |
3529 |
} |
|
47948
8b11e4b32db3
8133616: compiler error messages for dup single type, single static import switched
jlahoda
parents:
47934
diff
changeset
|
3530 |
Symbol clashing = topLevelScope.findFirst(sym.name, duplicates); |
27857 | 3531 |
if (clashing != null) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3532 |
log.error(pos, Errors.AlreadyDefinedThisUnit(clashing)); |
27857 | 3533 |
return false; |
10 | 3534 |
} |
3535 |
return true; |
|
3536 |
} |
|
3537 |
||
3538 |
/** Check that a qualified name is in canonical form (for import decls). |
|
3539 |
*/ |
|
3540 |
public void checkCanonical(JCTree tree) { |
|
3541 |
if (!isCanonical(tree)) |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3542 |
log.error(tree.pos(), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3543 |
Errors.ImportRequiresCanonical(TreeInfo.symbol(tree))); |
10 | 3544 |
} |
3545 |
// where |
|
3546 |
private boolean isCanonical(JCTree tree) { |
|
10950 | 3547 |
while (tree.hasTag(SELECT)) { |
10 | 3548 |
JCFieldAccess s = (JCFieldAccess) tree; |
47438
286cb51fd280
8187247: canonical import check compares classes by simple name
cushon
parents:
47268
diff
changeset
|
3549 |
if (s.sym.owner.getQualifiedName() != TreeInfo.symbol(s.selected).getQualifiedName()) |
10 | 3550 |
return false; |
3551 |
tree = s.selected; |
|
3552 |
} |
|
3553 |
return true; |
|
3554 |
} |
|
3555 |
||
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3556 |
/** 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
|
3557 |
*/ |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3558 |
void checkForBadAuxiliaryClassAccess(DiagnosticPosition pos, Env<AttrContext> env, ClassSymbol c) { |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3559 |
if (lint.isEnabled(Lint.LintCategory.AUXILIARYCLASS) && |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3560 |
(c.flags() & AUXILIARY) != 0 && |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3561 |
rs.isAccessible(env, c) && |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3562 |
!fileManager.isSameFile(c.sourcefile, env.toplevel.sourcefile)) |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3563 |
{ |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3564 |
log.warning(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3565 |
Warnings.AuxiliaryClassAccessedFromOutsideOfItsSourceFile(c, c.sourcefile)); |
14369
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3566 |
} |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3567 |
} |
3d660d08d1f7
7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents:
14359
diff
changeset
|
3568 |
|
10 | 3569 |
private class ConversionWarner extends Warner { |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3570 |
final String uncheckedKey; |
10 | 3571 |
final Type found; |
3572 |
final Type expected; |
|
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3573 |
public ConversionWarner(DiagnosticPosition pos, String uncheckedKey, Type found, Type expected) { |
10 | 3574 |
super(pos); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3575 |
this.uncheckedKey = uncheckedKey; |
10 | 3576 |
this.found = found; |
3577 |
this.expected = expected; |
|
3578 |
} |
|
3579 |
||
3780
368edd3d2082
6874249: Check has duplicate local variable and field for "source"
jjg
parents:
3765
diff
changeset
|
3580 |
@Override |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3581 |
public void warn(LintCategory lint) { |
10 | 3582 |
boolean warned = this.warned; |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3583 |
super.warn(lint); |
10 | 3584 |
if (warned) return; // suppress redundant diagnostics |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3585 |
switch (lint) { |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3586 |
case UNCHECKED: |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
3587 |
Check.this.warnUnchecked(pos(), Warnings.ProbFoundReq(diags.fragment(uncheckedKey), found, expected)); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3588 |
break; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3589 |
case VARARGS: |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3590 |
if (method != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3591 |
method.attribute(syms.trustMeType.tsym) != null && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3592 |
isTrustMeAllowedOnMethod(method) && |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3593 |
!types.isReifiable(method.type.getParameterTypes().last())) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48459
diff
changeset
|
3594 |
Check.this.warnUnsafeVararg(pos(), Warnings.VarargsUnsafeUseVarargsParam(method.params.last())); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3595 |
} |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3596 |
break; |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3597 |
default: |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3598 |
throw new AssertionError("Unexpected lint: " + lint); |
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
7628
diff
changeset
|
3599 |
} |
10 | 3600 |
} |
3601 |
} |
|
3602 |
||
3603 |
public Warner castWarner(DiagnosticPosition pos, Type found, Type expected) { |
|
3604 |
return new ConversionWarner(pos, "unchecked.cast.to.type", found, expected); |
|
3605 |
} |
|
3606 |
||
3607 |
public Warner convertWarner(DiagnosticPosition pos, Type found, Type expected) { |
|
3608 |
return new ConversionWarner(pos, "unchecked.assign", found, expected); |
|
3609 |
} |
|
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3610 |
|
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3611 |
public void checkFunctionalInterface(JCClassDecl tree, ClassSymbol cs) { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3612 |
Compound functionalType = cs.attribute(syms.functionalInterfaceType.tsym); |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3613 |
|
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3614 |
if (functionalType != null) { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3615 |
try { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3616 |
types.findDescriptorSymbol((TypeSymbol)cs); |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3617 |
} catch (Types.FunctionDescriptorLookupError ex) { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3618 |
DiagnosticPosition pos = tree.pos(); |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3619 |
for (JCAnnotation a : tree.getModifiers().annotations) { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3620 |
if (a.annotationType.type.tsym == syms.functionalInterfaceType.tsym) { |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3621 |
pos = a.pos(); |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3622 |
break; |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3623 |
} |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3624 |
} |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3625 |
log.error(pos, Errors.BadFunctionalIntfAnno1(ex.getDiagnostic())); |
21018
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3626 |
} |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3627 |
} |
95d225149128
8014016: javac is too late detecting invalid annotation usage
jlahoda
parents:
21009
diff
changeset
|
3628 |
} |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3629 |
|
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3630 |
public void checkImportsResolvable(final JCCompilationUnit toplevel) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3631 |
for (final JCImport imp : toplevel.getImports()) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3632 |
if (!imp.staticImport || !imp.qualid.hasTag(SELECT)) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3633 |
continue; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3634 |
final JCFieldAccess select = (JCFieldAccess) imp.qualid; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3635 |
final Symbol origin; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3636 |
if (select.name == names.asterisk || (origin = TreeInfo.symbol(select.selected)) == null || origin.kind != TYP) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3637 |
continue; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3638 |
|
27857 | 3639 |
TypeSymbol site = (TypeSymbol) TreeInfo.symbol(select.selected); |
3640 |
if (!checkTypeContainsImportableElement(site, site, toplevel.packge, select.name, new HashSet<Symbol>())) { |
|
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3641 |
log.error(imp.pos(), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3642 |
Errors.CantResolveLocation(KindName.STATIC, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3643 |
select.name, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3644 |
null, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3645 |
null, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3646 |
Fragments.Location(kindName(site), |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3647 |
site, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3648 |
null))); |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3649 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3650 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3651 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3652 |
|
31299
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3653 |
// Check that packages imported are in scope (JLS 7.4.3, 6.3, 6.5.3.1, 6.5.3.2) |
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3654 |
public void checkImportedPackagesObservable(final JCCompilationUnit toplevel) { |
36526 | 3655 |
OUTER: for (JCImport imp : toplevel.getImports()) { |
31299
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3656 |
if (!imp.staticImport && TreeInfo.name(imp.qualid) == names.asterisk) { |
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3657 |
TypeSymbol tsym = ((JCFieldAccess)imp.qualid).selected.type.tsym; |
50539
7bf4f1b5e438
8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents:
50250
diff
changeset
|
3658 |
if (tsym.kind == PCK && tsym.members().isEmpty() && |
7bf4f1b5e438
8193302: Javac AssertionError: typeSig ERROR on usage of @Generated
jlahoda
parents:
50250
diff
changeset
|
3659 |
!(Feature.IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES.allowedInSource(source) && tsym.exists())) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
45413
diff
changeset
|
3660 |
log.error(DiagnosticFlag.RESOLVE_ERROR, imp.pos, Errors.DoesntExist(tsym)); |
31299
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3661 |
} |
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3662 |
} |
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3663 |
} |
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3664 |
} |
81ce5febcae8
4869999: Error on import statement naming package containing no class files
sadayapalam
parents:
31212
diff
changeset
|
3665 |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3666 |
private boolean checkTypeContainsImportableElement(TypeSymbol tsym, TypeSymbol origin, PackageSymbol packge, Name name, Set<Symbol> processed) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3667 |
if (tsym == null || !processed.add(tsym)) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3668 |
return false; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3669 |
|
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3670 |
// also search through inherited names |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3671 |
if (checkTypeContainsImportableElement(types.supertype(tsym.type).tsym, origin, packge, name, processed)) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3672 |
return true; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3673 |
|
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3674 |
for (Type t : types.interfaces(tsym.type)) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3675 |
if (checkTypeContainsImportableElement(t.tsym, origin, packge, name, processed)) |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3676 |
return true; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3677 |
|
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3678 |
for (Symbol sym : tsym.members().getSymbolsByName(name)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3679 |
if (sym.isStatic() && |
29149
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3680 |
importAccessible(sym, packge) && |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3681 |
sym.isMemberOf(origin, types)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3682 |
return true; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3683 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3684 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3685 |
|
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3686 |
return false; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3687 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3688 |
|
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3689 |
// is the sym accessible everywhere in packge? |
29149
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3690 |
public boolean importAccessible(Symbol sym, PackageSymbol packge) { |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3691 |
try { |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3692 |
int flags = (int)(sym.flags() & AccessFlags); |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3693 |
switch (flags) { |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3694 |
default: |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3695 |
case PUBLIC: |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3696 |
return true; |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3697 |
case PRIVATE: |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3698 |
return false; |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3699 |
case 0: |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3700 |
case PROTECTED: |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3701 |
return sym.packge() == packge; |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3702 |
} |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3703 |
} catch (ClassFinder.BadClassFile err) { |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3704 |
throw err; |
3fa94aad0264
8067886: Inaccessible nested classes can be incorrectly imported
jlahoda
parents:
29051
diff
changeset
|
3705 |
} catch (CompletionFailure ex) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3706 |
return false; |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3707 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3708 |
} |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25301
diff
changeset
|
3709 |
|
41444
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3710 |
public void checkLeaksNotAccessible(Env<AttrContext> env, JCClassDecl check) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3711 |
JCCompilationUnit toplevel = env.toplevel; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3712 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3713 |
if ( toplevel.modle == syms.unnamedModule |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3714 |
|| toplevel.modle == syms.noModule |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3715 |
|| (check.sym.flags() & COMPOUND) != 0) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3716 |
return ; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3717 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3718 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3719 |
ExportsDirective currentExport = findExport(toplevel.packge); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3720 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3721 |
if ( currentExport == null //not exported |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3722 |
|| currentExport.modules != null) //don't check classes in qualified export |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3723 |
return ; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3724 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3725 |
new TreeScanner() { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3726 |
Lint lint = env.info.lint; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3727 |
boolean inSuperType; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3728 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3729 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3730 |
public void visitBlock(JCBlock tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3731 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3732 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3733 |
public void visitMethodDef(JCMethodDecl tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3734 |
if (!isAPISymbol(tree.sym)) |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3735 |
return; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3736 |
Lint prevLint = lint; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3737 |
try { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3738 |
lint = lint.augment(tree.sym); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3739 |
if (lint.isEnabled(LintCategory.EXPORTS)) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3740 |
super.visitMethodDef(tree); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3741 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3742 |
} finally { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3743 |
lint = prevLint; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3744 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3745 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3746 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3747 |
public void visitVarDef(JCVariableDecl tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3748 |
if (!isAPISymbol(tree.sym) && tree.sym.owner.kind != MTH) |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3749 |
return; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3750 |
Lint prevLint = lint; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3751 |
try { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3752 |
lint = lint.augment(tree.sym); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3753 |
if (lint.isEnabled(LintCategory.EXPORTS)) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3754 |
scan(tree.mods); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3755 |
scan(tree.vartype); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3756 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3757 |
} finally { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3758 |
lint = prevLint; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3759 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3760 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3761 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3762 |
public void visitClassDef(JCClassDecl tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3763 |
if (tree != check) |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3764 |
return ; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3765 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3766 |
if (!isAPISymbol(tree.sym)) |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3767 |
return ; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3768 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3769 |
Lint prevLint = lint; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3770 |
try { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3771 |
lint = lint.augment(tree.sym); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3772 |
if (lint.isEnabled(LintCategory.EXPORTS)) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3773 |
scan(tree.mods); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3774 |
scan(tree.typarams); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3775 |
try { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3776 |
inSuperType = true; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3777 |
scan(tree.extending); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3778 |
scan(tree.implementing); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3779 |
} finally { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3780 |
inSuperType = false; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3781 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3782 |
scan(tree.defs); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3783 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3784 |
} finally { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3785 |
lint = prevLint; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3786 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3787 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3788 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3789 |
public void visitTypeApply(JCTypeApply tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3790 |
scan(tree.clazz); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3791 |
boolean oldInSuperType = inSuperType; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3792 |
try { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3793 |
inSuperType = false; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3794 |
scan(tree.arguments); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3795 |
} finally { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3796 |
inSuperType = oldInSuperType; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3797 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3798 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3799 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3800 |
public void visitIdent(JCIdent tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3801 |
Symbol sym = TreeInfo.symbol(tree); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3802 |
if (sym.kind == TYP && !sym.type.hasTag(TYPEVAR)) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3803 |
checkVisible(tree.pos(), sym, toplevel.packge, inSuperType); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3804 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3805 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3806 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3807 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3808 |
public void visitSelect(JCFieldAccess tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3809 |
Symbol sym = TreeInfo.symbol(tree); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3810 |
Symbol sitesym = TreeInfo.symbol(tree.selected); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3811 |
if (sym.kind == TYP && sitesym.kind == PCK) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3812 |
checkVisible(tree.pos(), sym, toplevel.packge, inSuperType); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3813 |
} else { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3814 |
super.visitSelect(tree); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3815 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3816 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3817 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3818 |
@Override |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3819 |
public void visitAnnotation(JCAnnotation tree) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3820 |
if (tree.attribute.type.tsym.getAnnotation(java.lang.annotation.Documented.class) != null) |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3821 |
super.visitAnnotation(tree); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3822 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3823 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3824 |
}.scan(check); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3825 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3826 |
//where: |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3827 |
private ExportsDirective findExport(PackageSymbol pack) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3828 |
for (ExportsDirective d : pack.modle.exports) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3829 |
if (d.packge == pack) |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3830 |
return d; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3831 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3832 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3833 |
return null; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3834 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3835 |
private boolean isAPISymbol(Symbol sym) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3836 |
while (sym.kind != PCK) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3837 |
if ((sym.flags() & Flags.PUBLIC) == 0 && (sym.flags() & Flags.PROTECTED) == 0) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3838 |
return false; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3839 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3840 |
sym = sym.owner; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3841 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3842 |
return true; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3843 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3844 |
private void checkVisible(DiagnosticPosition pos, Symbol what, PackageSymbol inPackage, boolean inSuperType) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3845 |
if (!isAPISymbol(what) && !inSuperType) { //package private/private element |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3846 |
log.warning(LintCategory.EXPORTS, pos, Warnings.LeaksNotAccessible(kindName(what), what, what.packge().modle)); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3847 |
return ; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3848 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3849 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3850 |
PackageSymbol whatPackage = what.packge(); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3851 |
ExportsDirective whatExport = findExport(whatPackage); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3852 |
ExportsDirective inExport = findExport(inPackage); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3853 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3854 |
if (whatExport == null) { //package not exported: |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3855 |
log.warning(LintCategory.EXPORTS, pos, Warnings.LeaksNotAccessibleUnexported(kindName(what), what, what.packge().modle)); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3856 |
return ; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3857 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3858 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3859 |
if (whatExport.modules != null) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3860 |
if (inExport.modules == null || !whatExport.modules.containsAll(inExport.modules)) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3861 |
log.warning(LintCategory.EXPORTS, pos, Warnings.LeaksNotAccessibleUnexportedQualified(kindName(what), what, what.packge().modle)); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3862 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3863 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3864 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3865 |
if (whatPackage.modle != inPackage.modle && whatPackage.modle != syms.java_base) { |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
3866 |
//check that relativeTo.modle requires transitive what.modle, somehow: |
41444
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3867 |
List<ModuleSymbol> todo = List.of(inPackage.modle); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3868 |
|
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3869 |
while (todo.nonEmpty()) { |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3870 |
ModuleSymbol current = todo.head; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3871 |
todo = todo.tail; |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3872 |
if (current == whatPackage.modle) |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3873 |
return ; //OK |
47873
7944849362f3
8191112: javac OutOfMemoryError caused by \"-Xlint:exports\" option
jlahoda
parents:
47438
diff
changeset
|
3874 |
if ((current.flags() & Flags.AUTOMATIC_MODULE) != 0) |
7944849362f3
8191112: javac OutOfMemoryError caused by \"-Xlint:exports\" option
jlahoda
parents:
47438
diff
changeset
|
3875 |
continue; //for automatic modules, don't look into their dependencies |
41444
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3876 |
for (RequiresDirective req : current.requires) { |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
3877 |
if (req.isTransitive()) { |
41444
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3878 |
todo = todo.prepend(req.module); |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3879 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3880 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3881 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3882 |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41637
diff
changeset
|
3883 |
log.warning(LintCategory.EXPORTS, pos, Warnings.LeaksNotAccessibleNotRequiredTransitive(kindName(what), what, what.packge().modle)); |
41444
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3884 |
} |
b61c805c6173
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40772
diff
changeset
|
3885 |
} |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
3886 |
|
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
3887 |
void checkModuleExists(final DiagnosticPosition pos, ModuleSymbol msym) { |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
3888 |
if (msym.kind != MDL) { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
3889 |
deferredLintHandler.report(() -> { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
3890 |
if (lint.isEnabled(LintCategory.MODULE)) |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42822
diff
changeset
|
3891 |
log.warning(LintCategory.MODULE, pos, Warnings.ModuleNotFound(msym)); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
3892 |
}); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
3893 |
} |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
3894 |
} |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42407
diff
changeset
|
3895 |
|
43588
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3896 |
void checkPackageExistsForOpens(final DiagnosticPosition pos, PackageSymbol packge) { |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3897 |
if (packge.members().isEmpty() && |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3898 |
((packge.flags() & Flags.HAS_RESOURCE) == 0)) { |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3899 |
deferredLintHandler.report(() -> { |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3900 |
if (lint.isEnabled(LintCategory.OPENS)) |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3901 |
log.warning(pos, Warnings.PackageEmptyOrNotFound(packge)); |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3902 |
}); |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3903 |
} |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3904 |
} |
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43279
diff
changeset
|
3905 |
|
44576 | 3906 |
void checkModuleRequires(final DiagnosticPosition pos, final RequiresDirective rd) { |
3907 |
if ((rd.module.flags() & Flags.AUTOMATIC_MODULE) != 0) { |
|
3908 |
deferredLintHandler.report(() -> { |
|
3909 |
if (rd.isTransitive() && lint.isEnabled(LintCategory.REQUIRES_TRANSITIVE_AUTOMATIC)) { |
|
3910 |
log.warning(pos, Warnings.RequiresTransitiveAutomatic); |
|
3911 |
} else if (lint.isEnabled(LintCategory.REQUIRES_AUTOMATIC)) { |
|
3912 |
log.warning(pos, Warnings.RequiresAutomatic); |
|
3913 |
} |
|
3914 |
}); |
|
3915 |
} |
|
3916 |
} |
|
3917 |
||
10 | 3918 |
} |