author | chegar |
Thu, 17 Oct 2019 20:53:35 +0100 | |
branch | datagramsocketimpl-branch |
changeset 58678 | 9cf78a70fa4f |
parent 53515 | a772e65727c5 |
child 58679 | 9c3209ff7550 |
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 |
*/ |
|
58678 | 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 |
||
58678 | 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()) { |
|