author | jlahoda |
Wed, 27 Nov 2019 09:00:01 +0100 | |
changeset 59285 | 7799a51dbe30 |
parent 55306 | ea43db53de91 |
permissions | -rw-r--r-- |
10 | 1 |
/* |
55306 | 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 |
//todo: one might eliminate uninits.andSets when monotonic |
|
27 |
||
28 |
package com.sun.tools.javac.comp; |
|
29 |
||
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
3149
diff
changeset
|
30 |
import java.util.HashMap; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
31 |
import java.util.HashSet; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
32 |
import java.util.Set; |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
3149
diff
changeset
|
33 |
|
41640
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
34 |
import com.sun.source.tree.LambdaExpressionTree.BodyKind; |
10 | 35 |
import com.sun.tools.javac.code.*; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
24610
diff
changeset
|
36 |
import com.sun.tools.javac.code.Scope.WriteableScope; |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47216
diff
changeset
|
37 |
import com.sun.tools.javac.code.Source.Feature; |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
38 |
import com.sun.tools.javac.resources.CompilerProperties.Errors; |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
39 |
import com.sun.tools.javac.resources.CompilerProperties.Warnings; |
10 | 40 |
import com.sun.tools.javac.tree.*; |
41 |
import com.sun.tools.javac.util.*; |
|
42 |
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:
48054
diff
changeset
|
43 |
import com.sun.tools.javac.util.JCDiagnostic.Error; |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
44 |
import com.sun.tools.javac.util.JCDiagnostic.Warning; |
10 | 45 |
|
46 |
import com.sun.tools.javac.code.Symbol.*; |
|
47 |
import com.sun.tools.javac.tree.JCTree.*; |
|
48 |
||
49 |
import static com.sun.tools.javac.code.Flags.*; |
|
10950 | 50 |
import static com.sun.tools.javac.code.Flags.BLOCK; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26537
diff
changeset
|
51 |
import static com.sun.tools.javac.code.Kinds.Kind.*; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14259
diff
changeset
|
52 |
import static com.sun.tools.javac.code.TypeTag.BOOLEAN; |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14259
diff
changeset
|
53 |
import static com.sun.tools.javac.code.TypeTag.VOID; |
10950 | 54 |
import static com.sun.tools.javac.tree.JCTree.Tag.*; |
10 | 55 |
|
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
56 |
/** This pass implements dataflow analysis for Java programs though |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22166
diff
changeset
|
57 |
* different AST visitor steps. Liveness analysis (see AliveAnalyzer) checks that |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
58 |
* every statement is reachable. Exception analysis (see FlowAnalyzer) ensures that |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
59 |
* every checked exception that is thrown is declared or caught. Definite assignment analysis |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
60 |
* (see AssignAnalyzer) ensures that each variable is assigned when used. Definite |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
61 |
* unassignment analysis (see AssignAnalyzer) in ensures that no final variable |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
62 |
* is assigned more than once. Finally, local variable capture analysis (see CaptureAnalyzer) |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
63 |
* determines that local variables accessed within the scope of an inner class/lambda |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
64 |
* are either final or effectively-final. |
10 | 65 |
* |
9303
eae35c201e19
7032975: API files in javax.annotation.processing need to be updated for references to JLS
jjh
parents:
9300
diff
changeset
|
66 |
* <p>The JLS has a number of problems in the |
10 | 67 |
* specification of these flow analysis problems. This implementation |
68 |
* attempts to address those issues. |
|
69 |
* |
|
70 |
* <p>First, there is no accommodation for a finally clause that cannot |
|
71 |
* complete normally. For liveness analysis, an intervening finally |
|
72 |
* clause can cause a break, continue, or return not to reach its |
|
73 |
* target. For exception analysis, an intervening finally clause can |
|
74 |
* cause any exception to be "caught". For DA/DU analysis, the finally |
|
75 |
* clause can prevent a transfer of control from propagating DA/DU |
|
76 |
* state to the target. In addition, code in the finally clause can |
|
77 |
* affect the DA/DU status of variables. |
|
78 |
* |
|
79 |
* <p>For try statements, we introduce the idea of a variable being |
|
80 |
* definitely unassigned "everywhere" in a block. A variable V is |
|
81 |
* "unassigned everywhere" in a block iff it is unassigned at the |
|
82 |
* beginning of the block and there is no reachable assignment to V |
|
83 |
* in the block. An assignment V=e is reachable iff V is not DA |
|
84 |
* after e. Then we can say that V is DU at the beginning of the |
|
85 |
* catch block iff V is DU everywhere in the try block. Similarly, V |
|
86 |
* is DU at the beginning of the finally block iff V is DU everywhere |
|
87 |
* in the try block and in every catch block. Specifically, the |
|
88 |
* following bullet is added to 16.2.2 |
|
89 |
* <pre> |
|
90 |
* V is <em>unassigned everywhere</em> in a block if it is |
|
91 |
* unassigned before the block and there is no reachable |
|
92 |
* assignment to V within the block. |
|
93 |
* </pre> |
|
94 |
* <p>In 16.2.15, the third bullet (and all of its sub-bullets) for all |
|
95 |
* try blocks is changed to |
|
96 |
* <pre> |
|
97 |
* V is definitely unassigned before a catch block iff V is |
|
98 |
* definitely unassigned everywhere in the try block. |
|
99 |
* </pre> |
|
100 |
* <p>The last bullet (and all of its sub-bullets) for try blocks that |
|
101 |
* have a finally block is changed to |
|
102 |
* <pre> |
|
103 |
* V is definitely unassigned before the finally block iff |
|
104 |
* V is definitely unassigned everywhere in the try block |
|
105 |
* and everywhere in each catch block of the try statement. |
|
106 |
* </pre> |
|
107 |
* <p>In addition, |
|
108 |
* <pre> |
|
109 |
* V is definitely assigned at the end of a constructor iff |
|
110 |
* V is definitely assigned after the block that is the body |
|
111 |
* of the constructor and V is definitely assigned at every |
|
112 |
* return that can return from the constructor. |
|
113 |
* </pre> |
|
114 |
* <p>In addition, each continue statement with the loop as its target |
|
115 |
* is treated as a jump to the end of the loop body, and "intervening" |
|
116 |
* finally clauses are treated as follows: V is DA "due to the |
|
117 |
* continue" iff V is DA before the continue statement or V is DA at |
|
118 |
* the end of any intervening finally block. V is DU "due to the |
|
119 |
* continue" iff any intervening finally cannot complete normally or V |
|
120 |
* is DU at the end of every intervening finally block. This "due to |
|
121 |
* the continue" concept is then used in the spec for the loops. |
|
122 |
* |
|
123 |
* <p>Similarly, break statements must consider intervening finally |
|
124 |
* blocks. For liveness analysis, a break statement for which any |
|
125 |
* intervening finally cannot complete normally is not considered to |
|
126 |
* cause the target statement to be able to complete normally. Then |
|
127 |
* we say V is DA "due to the break" iff V is DA before the break or |
|
128 |
* V is DA at the end of any intervening finally block. V is DU "due |
|
129 |
* to the break" iff any intervening finally cannot complete normally |
|
130 |
* or V is DU at the break and at the end of every intervening |
|
131 |
* finally block. (I suspect this latter condition can be |
|
132 |
* simplified.) This "due to the break" is then used in the spec for |
|
133 |
* all statements that can be "broken". |
|
134 |
* |
|
135 |
* <p>The return statement is treated similarly. V is DA "due to a |
|
136 |
* return statement" iff V is DA before the return statement or V is |
|
137 |
* DA at the end of any intervening finally block. Note that we |
|
138 |
* don't have to worry about the return expression because this |
|
139 |
* concept is only used for construcrors. |
|
140 |
* |
|
9303
eae35c201e19
7032975: API files in javax.annotation.processing need to be updated for references to JLS
jjh
parents:
9300
diff
changeset
|
141 |
* <p>There is no spec in the JLS for when a variable is definitely |
10 | 142 |
* assigned at the end of a constructor, which is needed for final |
143 |
* fields (8.3.1.2). We implement the rule that V is DA at the end |
|
144 |
* of the constructor iff it is DA and the end of the body of the |
|
145 |
* constructor and V is DA "due to" every return of the constructor. |
|
146 |
* |
|
147 |
* <p>Intervening finally blocks similarly affect exception analysis. An |
|
148 |
* intervening finally that cannot complete normally allows us to ignore |
|
149 |
* an otherwise uncaught exception. |
|
150 |
* |
|
151 |
* <p>To implement the semantics of intervening finally clauses, all |
|
152 |
* nonlocal transfers (break, continue, return, throw, method call that |
|
153 |
* can throw a checked exception, and a constructor invocation that can |
|
154 |
* thrown a checked exception) are recorded in a queue, and removed |
|
155 |
* from the queue when we complete processing the target of the |
|
156 |
* nonlocal transfer. This allows us to modify the queue in accordance |
|
157 |
* with the above rules when we encounter a finally clause. The only |
|
158 |
* exception to this [no pun intended] is that checked exceptions that |
|
159 |
* are known to be caught or declared to be caught in the enclosing |
|
160 |
* method are not recorded in the queue, but instead are recorded in a |
|
14259 | 161 |
* global variable "{@code Set<Type> thrown}" that records the type of all |
10 | 162 |
* exceptions that can be thrown. |
163 |
* |
|
164 |
* <p>Other minor issues the treatment of members of other classes |
|
165 |
* (always considered DA except that within an anonymous class |
|
166 |
* constructor, where DA status from the enclosing scope is |
|
167 |
* preserved), treatment of the case expression (V is DA before the |
|
168 |
* case expression iff V is DA after the switch expression), |
|
169 |
* treatment of variables declared in a switch block (the implied |
|
170 |
* DA/DU status after the switch expression is DU and not DA for |
|
171 |
* variables defined in a switch block), the treatment of boolean ?: |
|
172 |
* expressions (The JLS rules only handle b and c non-boolean; the |
|
173 |
* new rule is that if b and c are boolean valued, then V is |
|
174 |
* (un)assigned after a?b:c when true/false iff V is (un)assigned |
|
175 |
* after b when true/false and V is (un)assigned after c when |
|
176 |
* true/false). |
|
177 |
* |
|
178 |
* <p>There is the remaining question of what syntactic forms constitute a |
|
179 |
* reference to a variable. It is conventional to allow this.x on the |
|
180 |
* left-hand-side to initialize a final instance field named x, yet |
|
181 |
* this.x isn't considered a "use" when appearing on a right-hand-side |
|
182 |
* in most implementations. Should parentheses affect what is |
|
183 |
* considered a variable reference? The simplest rule would be to |
|
184 |
* allow unqualified forms only, parentheses optional, and phase out |
|
185 |
* support for assigning to a final field via this.x. |
|
186 |
* |
|
5847
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5520
diff
changeset
|
187 |
* <p><b>This is NOT part of any supported API. |
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5520
diff
changeset
|
188 |
* If you write code that depends on this, you do so at your own risk. |
10 | 189 |
* This code and its internal interfaces are subject to change or |
190 |
* deletion without notice.</b> |
|
191 |
*/ |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
192 |
public class Flow { |
22163 | 193 |
protected static final Context.Key<Flow> flowKey = new Context.Key<>(); |
10 | 194 |
|
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
10
diff
changeset
|
195 |
private final Names names; |
10 | 196 |
private final Log log; |
197 |
private final Symtab syms; |
|
198 |
private final Types types; |
|
199 |
private final Check chk; |
|
200 |
private TreeMaker make; |
|
6156
e15c221efaac
6970833: Try-with-resource implementation throws an NPE during Flow analysis
mcimadamore
parents:
6151
diff
changeset
|
201 |
private final Resolve rs; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
202 |
private final JCDiagnostic.Factory diags; |
6156
e15c221efaac
6970833: Try-with-resource implementation throws an NPE during Flow analysis
mcimadamore
parents:
6151
diff
changeset
|
203 |
private Env<AttrContext> attrEnv; |
10 | 204 |
private Lint lint; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
205 |
private final boolean allowEffectivelyFinalInInnerClasses; |
10 | 206 |
|
207 |
public static Flow instance(Context context) { |
|
208 |
Flow instance = context.get(flowKey); |
|
209 |
if (instance == null) |
|
210 |
instance = new Flow(context); |
|
211 |
return instance; |
|
212 |
} |
|
213 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
214 |
public void analyzeTree(Env<AttrContext> env, TreeMaker make) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
215 |
new AliveAnalyzer().analyzeTree(env, make); |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
216 |
new AssignAnalyzer().analyzeTree(env, make); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
217 |
new FlowAnalyzer().analyzeTree(env, make); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
218 |
new CaptureAnalyzer().analyzeTree(env, make); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
219 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
220 |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
221 |
public void analyzeLambda(Env<AttrContext> env, JCLambda that, TreeMaker make, boolean speculative) { |
14538
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
222 |
Log.DiagnosticHandler diagHandler = null; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
223 |
//we need to disable diagnostics temporarily; the problem is that if |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
224 |
//a lambda expression contains e.g. an unreachable statement, an error |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
225 |
//message will be reported and will cause compilation to skip the flow analyis |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
226 |
//step - if we suppress diagnostics, we won't stop at Attr for flow-analysis |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
227 |
//related errors, which will allow for more errors to be detected |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
228 |
if (!speculative) { |
14538
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
229 |
diagHandler = new Log.DiscardDiagnosticHandler(log); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
230 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
231 |
try { |
41640
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
232 |
new LambdaAliveAnalyzer().analyzeTree(env, that, make); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
233 |
} finally { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
234 |
if (!speculative) { |
14538
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
235 |
log.popDiagnosticHandler(diagHandler); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
236 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
237 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
238 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
239 |
|
24610
8b3b718970a9
8042741: Java 8 compiler throws NullPointerException depending location in source file
pgovereau
parents:
24218
diff
changeset
|
240 |
public List<Type> analyzeLambdaThrownTypes(final Env<AttrContext> env, |
8b3b718970a9
8042741: Java 8 compiler throws NullPointerException depending location in source file
pgovereau
parents:
24218
diff
changeset
|
241 |
JCLambda that, TreeMaker make) { |
19933 | 242 |
//we need to disable diagnostics temporarily; the problem is that if |
243 |
//a lambda expression contains e.g. an unreachable statement, an error |
|
244 |
//message will be reported and will cause compilation to skip the flow analyis |
|
245 |
//step - if we suppress diagnostics, we won't stop at Attr for flow-analysis |
|
246 |
//related errors, which will allow for more errors to be detected |
|
247 |
Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log); |
|
248 |
try { |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
249 |
new LambdaAssignAnalyzer(env).analyzeTree(env, that, make); |
19933 | 250 |
LambdaFlowAnalyzer flowAnalyzer = new LambdaFlowAnalyzer(); |
251 |
flowAnalyzer.analyzeTree(env, that, make); |
|
252 |
return flowAnalyzer.inferredThrownTypes; |
|
253 |
} finally { |
|
254 |
log.popDiagnosticHandler(diagHandler); |
|
255 |
} |
|
256 |
} |
|
257 |
||
59285
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
258 |
public boolean aliveAfter(Env<AttrContext> env, JCTree that, TreeMaker make) { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
259 |
//we need to disable diagnostics temporarily; the problem is that if |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
260 |
//"that" contains e.g. an unreachable statement, an error |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
261 |
//message will be reported and will cause compilation to skip the flow analyis |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
262 |
//step - if we suppress diagnostics, we won't stop at Attr for flow-analysis |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
263 |
//related errors, which will allow for more errors to be detected |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
264 |
Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
265 |
try { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
266 |
SnippetAliveAnalyzer analyzer = new SnippetAliveAnalyzer(); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
267 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
268 |
analyzer.analyzeTree(env, that, make); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
269 |
return analyzer.isAlive(); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
270 |
} finally { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
271 |
log.popDiagnosticHandler(diagHandler); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
272 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
273 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
274 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
275 |
public boolean breaksOutOf(Env<AttrContext> env, JCTree loop, JCTree body, TreeMaker make) { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
276 |
//we need to disable diagnostics temporarily; the problem is that if |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
277 |
//"that" contains e.g. an unreachable statement, an error |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
278 |
//message will be reported and will cause compilation to skip the flow analyis |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
279 |
//step - if we suppress diagnostics, we won't stop at Attr for flow-analysis |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
280 |
//related errors, which will allow for more errors to be detected |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
281 |
Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
282 |
try { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
283 |
boolean[] breaksOut = new boolean[1]; |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
284 |
SnippetBreakAnalyzer analyzer = new SnippetBreakAnalyzer(loop); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
285 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
286 |
analyzer.analyzeTree(env, body, make); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
287 |
return analyzer.breaksOut(); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
288 |
} finally { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
289 |
log.popDiagnosticHandler(diagHandler); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
290 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
291 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
292 |
|
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
293 |
/** |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
294 |
* Definite assignment scan mode |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
295 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
296 |
enum FlowKind { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
297 |
/** |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
298 |
* This is the normal DA/DU analysis mode |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
299 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
300 |
NORMAL("var.might.already.be.assigned", false), |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
301 |
/** |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
302 |
* This is the speculative DA/DU analysis mode used to speculatively |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
303 |
* derive assertions within loop bodies |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
304 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
305 |
SPECULATIVE_LOOP("var.might.be.assigned.in.loop", true); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
306 |
|
14801
d66cab4ef397
8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents:
14547
diff
changeset
|
307 |
final String errKey; |
d66cab4ef397
8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents:
14547
diff
changeset
|
308 |
final boolean isFinal; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
309 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
310 |
FlowKind(String errKey, boolean isFinal) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
311 |
this.errKey = errKey; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
312 |
this.isFinal = isFinal; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
313 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
314 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
315 |
boolean isFinal() { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
316 |
return isFinal; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
317 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
318 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
319 |
|
10 | 320 |
protected Flow(Context context) { |
321 |
context.put(flowKey, this); |
|
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
10
diff
changeset
|
322 |
names = Names.instance(context); |
10 | 323 |
log = Log.instance(context); |
324 |
syms = Symtab.instance(context); |
|
325 |
types = Types.instance(context); |
|
326 |
chk = Check.instance(context); |
|
327 |
lint = Lint.instance(context); |
|
6156
e15c221efaac
6970833: Try-with-resource implementation throws an NPE during Flow analysis
mcimadamore
parents:
6151
diff
changeset
|
328 |
rs = Resolve.instance(context); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
329 |
diags = JCDiagnostic.Factory.instance(context); |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
3149
diff
changeset
|
330 |
Source source = Source.instance(context); |
48054
702043a4cdeb
8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents:
47216
diff
changeset
|
331 |
allowEffectivelyFinalInInnerClasses = Feature.EFFECTIVELY_FINAL_IN_INNER_CLASSES.allowedInSource(source); |
10 | 332 |
} |
333 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
334 |
/** |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
335 |
* Base visitor class for all visitors implementing dataflow analysis logic. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
336 |
* This class define the shared logic for handling jumps (break/continue statements). |
10 | 337 |
*/ |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
338 |
static abstract class BaseAnalyzer extends TreeScanner { |
10 | 339 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
340 |
enum JumpKind { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
341 |
BREAK(JCTree.Tag.BREAK) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
342 |
@Override |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
343 |
JCTree getTarget(JCTree tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
344 |
return ((JCBreak)tree).target; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
345 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
346 |
}, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
347 |
CONTINUE(JCTree.Tag.CONTINUE) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
348 |
@Override |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
349 |
JCTree getTarget(JCTree tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
350 |
return ((JCContinue)tree).target; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
351 |
} |
55306 | 352 |
}, |
353 |
YIELD(JCTree.Tag.YIELD) { |
|
354 |
@Override |
|
355 |
JCTree getTarget(JCTree tree) { |
|
356 |
return ((JCYield)tree).target; |
|
357 |
} |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
358 |
}; |
10 | 359 |
|
14801
d66cab4ef397
8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents:
14547
diff
changeset
|
360 |
final JCTree.Tag treeTag; |
10 | 361 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
362 |
private JumpKind(Tag treeTag) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
363 |
this.treeTag = treeTag; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
364 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
365 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
366 |
abstract JCTree getTarget(JCTree tree); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
367 |
} |
10 | 368 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
369 |
/** The currently pending exits that go from current inner blocks |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
370 |
* to an enclosing block, in source order. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
371 |
*/ |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
372 |
ListBuffer<PendingExit> pendingExits; |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5847
diff
changeset
|
373 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
374 |
/** A pending exit. These are the statements return, break, and |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
375 |
* continue. In addition, exception-throwing expressions or |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
376 |
* statements are put here when not known to be caught. This |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
377 |
* will typically result in an error unless it is within a |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
378 |
* try-finally whose finally block cannot complete normally. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
379 |
*/ |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
380 |
static class PendingExit { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
381 |
JCTree tree; |
10 | 382 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
383 |
PendingExit(JCTree tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
384 |
this.tree = tree; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
385 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
386 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
387 |
void resolveJump() { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
388 |
//do nothing |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
389 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
390 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
391 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
392 |
abstract void markDead(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
393 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
394 |
/** Record an outward transfer of control. */ |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
395 |
void recordExit(PendingExit pe) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
396 |
pendingExits.append(pe); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
397 |
markDead(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
398 |
} |
10 | 399 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
400 |
/** Resolve all jumps of this statement. */ |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
401 |
private Liveness resolveJump(JCTree tree, |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
402 |
ListBuffer<PendingExit> oldPendingExits, |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
403 |
JumpKind jk) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
404 |
boolean resolved = false; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
405 |
List<PendingExit> exits = pendingExits.toList(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
406 |
pendingExits = oldPendingExits; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
407 |
for (; exits.nonEmpty(); exits = exits.tail) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
408 |
PendingExit exit = exits.head; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
409 |
if (exit.tree.hasTag(jk.treeTag) && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
410 |
jk.getTarget(exit.tree) == tree) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
411 |
exit.resolveJump(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
412 |
resolved = true; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
413 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
414 |
pendingExits.append(exit); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
415 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
416 |
} |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
417 |
return Liveness.from(resolved); |
10 | 418 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
419 |
|
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
420 |
/** Resolve all continues of this statement. */ |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
421 |
Liveness resolveContinues(JCTree tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
422 |
return resolveJump(tree, new ListBuffer<PendingExit>(), JumpKind.CONTINUE); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
423 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
424 |
|
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
425 |
/** Resolve all breaks of this statement. */ |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
426 |
Liveness resolveBreaks(JCTree tree, ListBuffer<PendingExit> oldPendingExits) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
427 |
return resolveJump(tree, oldPendingExits, JumpKind.BREAK); |
10 | 428 |
} |
18912
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
429 |
|
55306 | 430 |
/** Resolve all yields of this statement. */ |
431 |
Liveness resolveYields(JCTree tree, ListBuffer<PendingExit> oldPendingExits) { |
|
432 |
return resolveJump(tree, oldPendingExits, JumpKind.YIELD); |
|
433 |
} |
|
434 |
||
18912
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
435 |
@Override |
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
436 |
public void scan(JCTree tree) { |
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
437 |
if (tree != null && ( |
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
438 |
tree.type == null || |
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
439 |
tree.type != Type.stuckType)) { |
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
440 |
super.scan(tree); |
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
441 |
} |
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18672
diff
changeset
|
442 |
} |
24069 | 443 |
|
444 |
public void visitPackageDef(JCPackageDecl tree) { |
|
445 |
// Do nothing for PackageDecl |
|
446 |
} |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
447 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
448 |
protected void scanSyntheticBreak(TreeMaker make, JCTree swtch) { |
55306 | 449 |
if (swtch.hasTag(SWITCH_EXPRESSION)) { |
450 |
JCYield brk = make.at(Position.NOPOS).Yield(null); |
|
451 |
brk.target = swtch; |
|
452 |
scan(brk); |
|
453 |
} else { |
|
454 |
JCBreak brk = make.at(Position.NOPOS).Break(null); |
|
455 |
brk.target = swtch; |
|
456 |
scan(brk); |
|
457 |
} |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
458 |
} |
10 | 459 |
} |
460 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
461 |
/** |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
462 |
* This pass implements the first step of the dataflow analysis, namely |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
463 |
* the liveness analysis check. This checks that every statement is reachable. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
464 |
* The output of this analysis pass are used by other analyzers. This analyzer |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
465 |
* sets the 'finallyCanCompleteNormally' field in the JCTry class. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
466 |
*/ |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
467 |
class AliveAnalyzer extends BaseAnalyzer { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
468 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
469 |
/** A flag that indicates whether the last statement could |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
470 |
* complete normally. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
471 |
*/ |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
472 |
private Liveness alive; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
473 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
474 |
@Override |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
475 |
void markDead() { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
476 |
alive = Liveness.DEAD; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
477 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
478 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
479 |
/************************************************************************* |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
480 |
* Visitor methods for statements and definitions |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
481 |
*************************************************************************/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
482 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
483 |
/** Analyze a definition. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
484 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
485 |
void scanDef(JCTree tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
486 |
scanStat(tree); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
487 |
if (tree != null && tree.hasTag(JCTree.Tag.BLOCK) && alive == Liveness.DEAD) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
488 |
log.error(tree.pos(), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
489 |
Errors.InitializerMustBeAbleToCompleteNormally); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
490 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
491 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
492 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
493 |
/** Analyze a statement. Check that statement is reachable. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
494 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
495 |
void scanStat(JCTree tree) { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
496 |
if (alive == Liveness.DEAD && tree != null) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
497 |
log.error(tree.pos(), Errors.UnreachableStmt); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
498 |
if (!tree.hasTag(SKIP)) alive = Liveness.RECOVERY; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
499 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
500 |
scan(tree); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
501 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
502 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
503 |
/** Analyze list of statements. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
504 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
505 |
void scanStats(List<? extends JCStatement> trees) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
506 |
if (trees != null) |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
507 |
for (List<? extends JCStatement> l = trees; l.nonEmpty(); l = l.tail) |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
508 |
scanStat(l.head); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
509 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
510 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
511 |
/* ------------ Visitor methods for various sorts of trees -------------*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
512 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
513 |
public void visitClassDef(JCClassDecl tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
514 |
if (tree.sym == null) return; |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
515 |
Liveness alivePrev = alive; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
516 |
ListBuffer<PendingExit> pendingExitsPrev = pendingExits; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
517 |
Lint lintPrev = lint; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
518 |
|
22163 | 519 |
pendingExits = new ListBuffer<>(); |
18010
604faee85350
8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents:
17998
diff
changeset
|
520 |
lint = lint.augment(tree.sym); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
521 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
522 |
try { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
523 |
// process all the static initializers |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
524 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
525 |
if (!l.head.hasTag(METHODDEF) && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
526 |
(TreeInfo.flags(l.head) & STATIC) != 0) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
527 |
scanDef(l.head); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
528 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
529 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
530 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
531 |
// process all the instance initializers |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
532 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
533 |
if (!l.head.hasTag(METHODDEF) && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
534 |
(TreeInfo.flags(l.head) & STATIC) == 0) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
535 |
scanDef(l.head); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
536 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
537 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
538 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
539 |
// process all the methods |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
540 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
541 |
if (l.head.hasTag(METHODDEF)) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
542 |
scan(l.head); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
543 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
544 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
545 |
} finally { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
546 |
pendingExits = pendingExitsPrev; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
547 |
alive = alivePrev; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
548 |
lint = lintPrev; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
549 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
550 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
551 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
552 |
public void visitMethodDef(JCMethodDecl tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
553 |
if (tree.body == null) return; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
554 |
Lint lintPrev = lint; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
555 |
|
18010
604faee85350
8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents:
17998
diff
changeset
|
556 |
lint = lint.augment(tree.sym); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
557 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
558 |
Assert.check(pendingExits.isEmpty()); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
559 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
560 |
try { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
561 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
562 |
scanStat(tree.body); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
563 |
|
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
564 |
if (alive == Liveness.ALIVE && !tree.sym.type.getReturnType().hasTag(VOID)) |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
565 |
log.error(TreeInfo.diagEndPos(tree.body), Errors.MissingRetStmt); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
566 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
567 |
List<PendingExit> exits = pendingExits.toList(); |
22163 | 568 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
569 |
while (exits.nonEmpty()) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
570 |
PendingExit exit = exits.head; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
571 |
exits = exits.tail; |
55306 | 572 |
Assert.check(exit.tree.hasTag(RETURN) || |
573 |
log.hasErrorOn(exit.tree.pos())); |
|
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
574 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
575 |
} finally { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
576 |
lint = lintPrev; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
577 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
578 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
579 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
580 |
public void visitVarDef(JCVariableDecl tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
581 |
if (tree.init != null) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
582 |
Lint lintPrev = lint; |
18010
604faee85350
8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents:
17998
diff
changeset
|
583 |
lint = lint.augment(tree.sym); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
584 |
try{ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
585 |
scan(tree.init); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
586 |
} finally { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
587 |
lint = lintPrev; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
588 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
589 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
590 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
591 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
592 |
public void visitBlock(JCBlock tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
593 |
scanStats(tree.stats); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
594 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
595 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
596 |
public void visitDoLoop(JCDoWhileLoop tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
597 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 598 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
599 |
scanStat(tree.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
600 |
alive = alive.or(resolveContinues(tree)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
601 |
scan(tree.cond); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
602 |
alive = alive.and(!tree.cond.type.isTrue()); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
603 |
alive = alive.or(resolveBreaks(tree, prevPendingExits)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
604 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
605 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
606 |
public void visitWhileLoop(JCWhileLoop tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
607 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 608 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
609 |
scan(tree.cond); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
610 |
alive = Liveness.from(!tree.cond.type.isFalse()); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
611 |
scanStat(tree.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
612 |
alive = alive.or(resolveContinues(tree)); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
613 |
alive = resolveBreaks(tree, prevPendingExits).or( |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
614 |
!tree.cond.type.isTrue()); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
615 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
616 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
617 |
public void visitForLoop(JCForLoop tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
618 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
619 |
scanStats(tree.init); |
22163 | 620 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
621 |
if (tree.cond != null) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
622 |
scan(tree.cond); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
623 |
alive = Liveness.from(!tree.cond.type.isFalse()); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
624 |
} else { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
625 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
626 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
627 |
scanStat(tree.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
628 |
alive = alive.or(resolveContinues(tree)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
629 |
scan(tree.step); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
630 |
alive = resolveBreaks(tree, prevPendingExits).or( |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
631 |
tree.cond != null && !tree.cond.type.isTrue()); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
632 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
633 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
634 |
public void visitForeachLoop(JCEnhancedForLoop tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
635 |
visitVarDef(tree.var); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
636 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
637 |
scan(tree.expr); |
22163 | 638 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
639 |
scanStat(tree.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
640 |
alive = alive.or(resolveContinues(tree)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
641 |
resolveBreaks(tree, prevPendingExits); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
642 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
643 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
644 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
645 |
public void visitLabelled(JCLabeledStatement tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
646 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 647 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
648 |
scanStat(tree.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
649 |
alive = alive.or(resolveBreaks(tree, prevPendingExits)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
650 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
651 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
652 |
public void visitSwitch(JCSwitch tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
653 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 654 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
655 |
scan(tree.selector); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
656 |
boolean hasDefault = false; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
657 |
for (List<JCCase> l = tree.cases; l.nonEmpty(); l = l.tail) { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
658 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
659 |
JCCase c = l.head; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
660 |
if (c.pats.isEmpty()) |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
661 |
hasDefault = true; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
662 |
else { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
663 |
for (JCExpression pat : c.pats) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
664 |
scan(pat); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
665 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
666 |
} |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
667 |
scanStats(c.stats); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
668 |
c.completesNormally = alive != Liveness.DEAD; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
669 |
if (alive != Liveness.DEAD && c.caseKind == JCCase.RULE) { |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
670 |
scanSyntheticBreak(make, tree); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
671 |
alive = Liveness.DEAD; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
672 |
} |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
673 |
// Warn about fall-through if lint switch fallthrough enabled. |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
674 |
if (alive == Liveness.ALIVE && |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
675 |
lint.isEnabled(Lint.LintCategory.FALLTHROUGH) && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
676 |
c.stats.nonEmpty() && l.tail.nonEmpty()) |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
677 |
log.warning(Lint.LintCategory.FALLTHROUGH, |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
678 |
l.tail.head.pos(), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
679 |
Warnings.PossibleFallThroughIntoCase); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
680 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
681 |
if (!hasDefault) { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
682 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
683 |
} |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
684 |
alive = alive.or(resolveBreaks(tree, prevPendingExits)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
685 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
686 |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
687 |
@Override |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
688 |
public void visitSwitchExpression(JCSwitchExpression tree) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
689 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
690 |
pendingExits = new ListBuffer<>(); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
691 |
scan(tree.selector); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
692 |
Set<Object> constants = null; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
693 |
if ((tree.selector.type.tsym.flags() & ENUM) != 0) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
694 |
constants = new HashSet<>(); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
695 |
for (Symbol s : tree.selector.type.tsym.members().getSymbols(s -> (s.flags() & ENUM) != 0)) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
696 |
constants.add(s.name); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
697 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
698 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
699 |
boolean hasDefault = false; |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
700 |
Liveness prevAlive = alive; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
701 |
for (List<JCCase> l = tree.cases; l.nonEmpty(); l = l.tail) { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
702 |
alive = Liveness.ALIVE; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
703 |
JCCase c = l.head; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
704 |
if (c.pats.isEmpty()) |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
705 |
hasDefault = true; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
706 |
else { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
707 |
for (JCExpression pat : c.pats) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
708 |
scan(pat); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
709 |
if (constants != null) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
710 |
if (pat.hasTag(IDENT)) |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
711 |
constants.remove(((JCIdent) pat).name); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
712 |
if (pat.type != null) |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
713 |
constants.remove(pat.type.constValue()); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
714 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
715 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
716 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
717 |
scanStats(c.stats); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
718 |
if (alive == Liveness.ALIVE) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
719 |
if (c.caseKind == JCCase.RULE) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
720 |
log.error(TreeInfo.diagEndPos(c.body), |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
721 |
Errors.RuleCompletesNormally); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
722 |
} else if (l.tail.isEmpty()) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
723 |
log.error(TreeInfo.diagEndPos(tree), |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
724 |
Errors.SwitchExpressionCompletesNormally); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
725 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
726 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
727 |
c.completesNormally = alive != Liveness.DEAD; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
728 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
729 |
if ((constants == null || !constants.isEmpty()) && !hasDefault) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
730 |
log.error(tree, Errors.NotExhaustive); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
731 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
732 |
alive = prevAlive; |
55306 | 733 |
alive = alive.or(resolveYields(tree, prevPendingExits)); |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
734 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
735 |
|
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
736 |
public void visitTry(JCTry tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
737 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 738 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
739 |
for (JCTree resource : tree.resources) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
740 |
if (resource instanceof JCVariableDecl) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
741 |
JCVariableDecl vdecl = (JCVariableDecl) resource; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
742 |
visitVarDef(vdecl); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
743 |
} else if (resource instanceof JCExpression) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
744 |
scan((JCExpression) resource); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
745 |
} else { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
746 |
throw new AssertionError(tree); // parser error |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
747 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
748 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
749 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
750 |
scanStat(tree.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
751 |
Liveness aliveEnd = alive; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
752 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
753 |
for (List<JCCatch> l = tree.catchers; l.nonEmpty(); l = l.tail) { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
754 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
755 |
JCVariableDecl param = l.head.param; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
756 |
scan(param); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
757 |
scanStat(l.head.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
758 |
aliveEnd = aliveEnd.or(alive); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
759 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
760 |
if (tree.finalizer != null) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
761 |
ListBuffer<PendingExit> exits = pendingExits; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
762 |
pendingExits = prevPendingExits; |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
763 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
764 |
scanStat(tree.finalizer); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
765 |
tree.finallyCanCompleteNormally = alive != Liveness.DEAD; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
766 |
if (alive == Liveness.DEAD) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
767 |
if (lint.isEnabled(Lint.LintCategory.FINALLY)) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
768 |
log.warning(Lint.LintCategory.FINALLY, |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
769 |
TreeInfo.diagEndPos(tree.finalizer), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
770 |
Warnings.FinallyCannotComplete); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
771 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
772 |
} else { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
773 |
while (exits.nonEmpty()) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
774 |
pendingExits.append(exits.next()); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
775 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
776 |
alive = aliveEnd; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
777 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
778 |
} else { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
779 |
alive = aliveEnd; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
780 |
ListBuffer<PendingExit> exits = pendingExits; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
781 |
pendingExits = prevPendingExits; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
782 |
while (exits.nonEmpty()) pendingExits.append(exits.next()); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
783 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
784 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
785 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
786 |
@Override |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
787 |
public void visitIf(JCIf tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
788 |
scan(tree.cond); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
789 |
scanStat(tree.thenpart); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
790 |
if (tree.elsepart != null) { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
791 |
Liveness aliveAfterThen = alive; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
792 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
793 |
scanStat(tree.elsepart); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
794 |
alive = alive.or(aliveAfterThen); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
795 |
} else { |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
796 |
alive = Liveness.ALIVE; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
797 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
798 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
799 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
800 |
public void visitBreak(JCBreak tree) { |
55306 | 801 |
recordExit(new PendingExit(tree)); |
802 |
} |
|
803 |
||
804 |
@Override |
|
805 |
public void visitYield(JCYield tree) { |
|
806 |
scan(tree.value); |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
807 |
recordExit(new PendingExit(tree)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
808 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
809 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
810 |
public void visitContinue(JCContinue tree) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
811 |
recordExit(new PendingExit(tree)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
812 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
813 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
814 |
public void visitReturn(JCReturn tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
815 |
scan(tree.expr); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
816 |
recordExit(new PendingExit(tree)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
817 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
818 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
819 |
public void visitThrow(JCThrow tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
820 |
scan(tree.expr); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
821 |
markDead(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
822 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
823 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
824 |
public void visitApply(JCMethodInvocation tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
825 |
scan(tree.meth); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
826 |
scan(tree.args); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
827 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
828 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
829 |
public void visitNewClass(JCNewClass tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
830 |
scan(tree.encl); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
831 |
scan(tree.args); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
832 |
if (tree.def != null) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
833 |
scan(tree.def); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
834 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
835 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
836 |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
837 |
@Override |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
838 |
public void visitLambda(JCLambda tree) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
839 |
if (tree.type != null && |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
840 |
tree.type.isErroneous()) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
841 |
return; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
842 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
843 |
|
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
844 |
ListBuffer<PendingExit> prevPending = pendingExits; |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
845 |
Liveness prevAlive = alive; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
846 |
try { |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19941
diff
changeset
|
847 |
pendingExits = new ListBuffer<>(); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
848 |
alive = Liveness.ALIVE; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
849 |
scanStat(tree.body); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
850 |
tree.canCompleteNormally = alive != Liveness.DEAD; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
851 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
852 |
finally { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
853 |
pendingExits = prevPending; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
854 |
alive = prevAlive; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
855 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
856 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
857 |
|
36526 | 858 |
public void visitModuleDef(JCModuleDecl tree) { |
859 |
// Do nothing for modules |
|
860 |
} |
|
861 |
||
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
862 |
/************************************************************************** |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
863 |
* main method |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
864 |
*************************************************************************/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
865 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
866 |
/** Perform definite assignment/unassignment analysis on a tree. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
867 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
868 |
public void analyzeTree(Env<AttrContext> env, TreeMaker make) { |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
869 |
analyzeTree(env, env.tree, make); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
870 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
871 |
public void analyzeTree(Env<AttrContext> env, JCTree tree, TreeMaker make) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
872 |
try { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
873 |
attrEnv = env; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
874 |
Flow.this.make = make; |
22163 | 875 |
pendingExits = new ListBuffer<>(); |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
876 |
alive = Liveness.ALIVE; |
16971
f4a2840bf9ad
8011377: Javac crashes when multiple lambdas are defined in an array
mcimadamore
parents:
15385
diff
changeset
|
877 |
scan(tree); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
878 |
} finally { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
879 |
pendingExits = null; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
880 |
Flow.this.make = null; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
881 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
882 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
883 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
884 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
885 |
/** |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
886 |
* This pass implements the second step of the dataflow analysis, namely |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
887 |
* the exception analysis. This is to ensure that every checked exception that is |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
888 |
* thrown is declared or caught. The analyzer uses some info that has been set by |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
889 |
* the liveliness analyzer. |
10 | 890 |
*/ |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
891 |
class FlowAnalyzer extends BaseAnalyzer { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
892 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
893 |
/** A flag that indicates whether the last statement could |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
894 |
* complete normally. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
895 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
896 |
HashMap<Symbol, List<Type>> preciseRethrowTypes; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
897 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
898 |
/** The current class being defined. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
899 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
900 |
JCClassDecl classDef; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
901 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
902 |
/** The list of possibly thrown declarable exceptions. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
903 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
904 |
List<Type> thrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
905 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
906 |
/** The list of exceptions that are either caught or declared to be |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
907 |
* thrown. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
908 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
909 |
List<Type> caught; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
910 |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
911 |
class ThrownPendingExit extends BaseAnalyzer.PendingExit { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
912 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
913 |
Type thrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
914 |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
915 |
ThrownPendingExit(JCTree tree, Type thrown) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
916 |
super(tree); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
917 |
this.thrown = thrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
918 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
919 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
920 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
921 |
@Override |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
922 |
void markDead() { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
923 |
//do nothing |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
924 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
925 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
926 |
/*-------------------- Exceptions ----------------------*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
927 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
928 |
/** Complain that pending exceptions are not caught. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
929 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
930 |
void errorUncaught() { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
931 |
for (PendingExit exit = pendingExits.next(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
932 |
exit != null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
933 |
exit = pendingExits.next()) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
934 |
Assert.check(exit instanceof ThrownPendingExit); |
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
935 |
ThrownPendingExit thrownExit = (ThrownPendingExit) exit; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
936 |
if (classDef != null && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
937 |
classDef.pos == exit.tree.pos) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
938 |
log.error(exit.tree.pos(), |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
939 |
Errors.UnreportedExceptionDefaultConstructor(thrownExit.thrown)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
940 |
} else if (exit.tree.hasTag(VARDEF) && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
941 |
((JCVariableDecl)exit.tree).sym.isResourceVariable()) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
942 |
log.error(exit.tree.pos(), |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
943 |
Errors.UnreportedExceptionImplicitClose(thrownExit.thrown, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
944 |
((JCVariableDecl)exit.tree).sym.name)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
945 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
946 |
log.error(exit.tree.pos(), |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
947 |
Errors.UnreportedExceptionNeedToCatchOrThrow(thrownExit.thrown)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
948 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
949 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
950 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
951 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
952 |
/** Record that exception is potentially thrown and check that it |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
953 |
* is caught. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
954 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
955 |
void markThrown(JCTree tree, Type exc) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
956 |
if (!chk.isUnchecked(tree.pos(), exc)) { |
17998
02a5abb2ae2f
7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents:
17282
diff
changeset
|
957 |
if (!chk.isHandled(exc, caught)) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
958 |
pendingExits.append(new ThrownPendingExit(tree, exc)); |
17998
02a5abb2ae2f
7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents:
17282
diff
changeset
|
959 |
} |
02a5abb2ae2f
7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents:
17282
diff
changeset
|
960 |
thrown = chk.incl(exc, thrown); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
961 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
962 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
963 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
964 |
/************************************************************************* |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
965 |
* Visitor methods for statements and definitions |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
966 |
*************************************************************************/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
967 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
968 |
/* ------------ Visitor methods for various sorts of trees -------------*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
969 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
970 |
public void visitClassDef(JCClassDecl tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
971 |
if (tree.sym == null) return; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
972 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
973 |
JCClassDecl classDefPrev = classDef; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
974 |
List<Type> thrownPrev = thrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
975 |
List<Type> caughtPrev = caught; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
976 |
ListBuffer<PendingExit> pendingExitsPrev = pendingExits; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
977 |
Lint lintPrev = lint; |
41854
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
978 |
boolean anonymousClass = tree.name == names.empty; |
22163 | 979 |
pendingExits = new ListBuffer<>(); |
41854
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
980 |
if (!anonymousClass) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
981 |
caught = List.nil(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
982 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
983 |
classDef = tree; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
984 |
thrown = List.nil(); |
18010
604faee85350
8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents:
17998
diff
changeset
|
985 |
lint = lint.augment(tree.sym); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
986 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
987 |
try { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
988 |
// process all the static initializers |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
989 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
990 |
if (!l.head.hasTag(METHODDEF) && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
991 |
(TreeInfo.flags(l.head) & STATIC) != 0) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
992 |
scan(l.head); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
993 |
errorUncaught(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
994 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
995 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
996 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
997 |
// add intersection of all thrown clauses of initial constructors |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
998 |
// to set of caught exceptions, unless class is anonymous. |
41854
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
999 |
if (!anonymousClass) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1000 |
boolean firstConstructor = true; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1001 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1002 |
if (TreeInfo.isInitialConstructor(l.head)) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1003 |
List<Type> mthrown = |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1004 |
((JCMethodDecl) l.head).sym.type.getThrownTypes(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1005 |
if (firstConstructor) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1006 |
caught = mthrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1007 |
firstConstructor = false; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1008 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1009 |
caught = chk.intersect(mthrown, caught); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1010 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1011 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1012 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1013 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1014 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1015 |
// process all the instance initializers |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1016 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1017 |
if (!l.head.hasTag(METHODDEF) && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1018 |
(TreeInfo.flags(l.head) & STATIC) == 0) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1019 |
scan(l.head); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1020 |
errorUncaught(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1021 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1022 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1023 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1024 |
// in an anonymous class, add the set of thrown exceptions to |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1025 |
// the throws clause of the synthetic constructor and propagate |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1026 |
// outwards. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1027 |
// Changing the throws clause on the fly is okay here because |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1028 |
// the anonymous constructor can't be invoked anywhere else, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1029 |
// and its type hasn't been cached. |
41854
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
1030 |
if (anonymousClass) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1031 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
41854
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
1032 |
if (TreeInfo.isConstructor(l.head)) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1033 |
JCMethodDecl mdef = (JCMethodDecl)l.head; |
41854
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
1034 |
scan(mdef); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1035 |
mdef.thrown = make.Types(thrown); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1036 |
mdef.sym.type = types.createMethodTypeWithThrown(mdef.sym.type, thrown); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1037 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1038 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1039 |
thrownPrev = chk.union(thrown, thrownPrev); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1040 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1041 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1042 |
// process all the methods |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1043 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
41854
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
1044 |
if (anonymousClass && TreeInfo.isConstructor(l.head)) |
12089a7805af
8166367: Missing ExceptionTable attribute in anonymous class constructors
sadayapalam
parents:
41640
diff
changeset
|
1045 |
continue; // there can never be an uncaught exception. |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1046 |
if (l.head.hasTag(METHODDEF)) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1047 |
scan(l.head); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1048 |
errorUncaught(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1049 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1050 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1051 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1052 |
thrown = thrownPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1053 |
} finally { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1054 |
pendingExits = pendingExitsPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1055 |
caught = caughtPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1056 |
classDef = classDefPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1057 |
lint = lintPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1058 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1059 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1060 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1061 |
public void visitMethodDef(JCMethodDecl tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1062 |
if (tree.body == null) return; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1063 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1064 |
List<Type> caughtPrev = caught; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1065 |
List<Type> mthrown = tree.sym.type.getThrownTypes(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1066 |
Lint lintPrev = lint; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1067 |
|
18010
604faee85350
8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents:
17998
diff
changeset
|
1068 |
lint = lint.augment(tree.sym); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1069 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1070 |
Assert.check(pendingExits.isEmpty()); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1071 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1072 |
try { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1073 |
for (List<JCVariableDecl> l = tree.params; l.nonEmpty(); l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1074 |
JCVariableDecl def = l.head; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1075 |
scan(def); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1076 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1077 |
if (TreeInfo.isInitialConstructor(tree)) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1078 |
caught = chk.union(caught, mthrown); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1079 |
else if ((tree.sym.flags() & (BLOCK | STATIC)) != BLOCK) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1080 |
caught = mthrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1081 |
// else we are in an instance initializer block; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1082 |
// leave caught unchanged. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1083 |
|
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1084 |
scan(tree.body); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1085 |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1086 |
List<PendingExit> exits = pendingExits.toList(); |
22163 | 1087 |
pendingExits = new ListBuffer<>(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1088 |
while (exits.nonEmpty()) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1089 |
PendingExit exit = exits.head; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1090 |
exits = exits.tail; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1091 |
if (!(exit instanceof ThrownPendingExit)) { |
55306 | 1092 |
Assert.check(exit.tree.hasTag(RETURN) || |
1093 |
log.hasErrorOn(exit.tree.pos())); |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1094 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1095 |
// uncaught throws will be reported later |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1096 |
pendingExits.append(exit); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1097 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1098 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1099 |
} finally { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1100 |
caught = caughtPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1101 |
lint = lintPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1102 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1103 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1104 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1105 |
public void visitVarDef(JCVariableDecl tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1106 |
if (tree.init != null) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1107 |
Lint lintPrev = lint; |
18010
604faee85350
8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents:
17998
diff
changeset
|
1108 |
lint = lint.augment(tree.sym); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1109 |
try{ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1110 |
scan(tree.init); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1111 |
} finally { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1112 |
lint = lintPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1113 |
} |
8428
1e9935b883cd
7017104: improve error reporting for uncaught/undeclared exceptions from try-with-resources
mcimadamore
parents:
8036
diff
changeset
|
1114 |
} |
10 | 1115 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1116 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1117 |
public void visitBlock(JCBlock tree) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1118 |
scan(tree.stats); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1119 |
} |
10 | 1120 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1121 |
public void visitDoLoop(JCDoWhileLoop tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1122 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 1123 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1124 |
scan(tree.body); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1125 |
resolveContinues(tree); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1126 |
scan(tree.cond); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1127 |
resolveBreaks(tree, prevPendingExits); |
10 | 1128 |
} |
1129 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1130 |
public void visitWhileLoop(JCWhileLoop tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1131 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 1132 |
pendingExits = new ListBuffer<>(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1133 |
scan(tree.cond); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1134 |
scan(tree.body); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1135 |
resolveContinues(tree); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1136 |
resolveBreaks(tree, prevPendingExits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1137 |
} |
10 | 1138 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1139 |
public void visitForLoop(JCForLoop tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1140 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1141 |
scan(tree.init); |
22163 | 1142 |
pendingExits = new ListBuffer<>(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1143 |
if (tree.cond != null) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1144 |
scan(tree.cond); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1145 |
} |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1146 |
scan(tree.body); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1147 |
resolveContinues(tree); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1148 |
scan(tree.step); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1149 |
resolveBreaks(tree, prevPendingExits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1150 |
} |
10 | 1151 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1152 |
public void visitForeachLoop(JCEnhancedForLoop tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1153 |
visitVarDef(tree.var); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1154 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1155 |
scan(tree.expr); |
22163 | 1156 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1157 |
scan(tree.body); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1158 |
resolveContinues(tree); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1159 |
resolveBreaks(tree, prevPendingExits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1160 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1161 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1162 |
public void visitLabelled(JCLabeledStatement tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1163 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 1164 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1165 |
scan(tree.body); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1166 |
resolveBreaks(tree, prevPendingExits); |
10 | 1167 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1168 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1169 |
public void visitSwitch(JCSwitch tree) { |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1170 |
handleSwitch(tree, tree.selector, tree.cases); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1171 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1172 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1173 |
@Override |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1174 |
public void visitSwitchExpression(JCSwitchExpression tree) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1175 |
handleSwitch(tree, tree.selector, tree.cases); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1176 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1177 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1178 |
private void handleSwitch(JCTree tree, JCExpression selector, List<JCCase> cases) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1179 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 1180 |
pendingExits = new ListBuffer<>(); |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1181 |
scan(selector); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1182 |
for (List<JCCase> l = cases; l.nonEmpty(); l = l.tail) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1183 |
JCCase c = l.head; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
1184 |
scan(c.pats); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1185 |
scan(c.stats); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1186 |
} |
55306 | 1187 |
if (tree.hasTag(SWITCH_EXPRESSION)) { |
1188 |
resolveYields(tree, prevPendingExits); |
|
1189 |
} else { |
|
1190 |
resolveBreaks(tree, prevPendingExits); |
|
1191 |
} |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1192 |
} |
10 | 1193 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1194 |
public void visitTry(JCTry tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1195 |
List<Type> caughtPrev = caught; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1196 |
List<Type> thrownPrev = thrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1197 |
thrown = List.nil(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1198 |
for (List<JCCatch> l = tree.catchers; l.nonEmpty(); l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1199 |
List<JCExpression> subClauses = TreeInfo.isMultiCatch(l.head) ? |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1200 |
((JCTypeUnion)l.head.param.vartype).alternatives : |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1201 |
List.of(l.head.param.vartype); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1202 |
for (JCExpression ct : subClauses) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1203 |
caught = chk.incl(ct.type, caught); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1204 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1205 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1206 |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1207 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 1208 |
pendingExits = new ListBuffer<>(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1209 |
for (JCTree resource : tree.resources) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1210 |
if (resource instanceof JCVariableDecl) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1211 |
JCVariableDecl vdecl = (JCVariableDecl) resource; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1212 |
visitVarDef(vdecl); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1213 |
} else if (resource instanceof JCExpression) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1214 |
scan((JCExpression) resource); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1215 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1216 |
throw new AssertionError(tree); // parser error |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1217 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1218 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1219 |
for (JCTree resource : tree.resources) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1220 |
List<Type> closeableSupertypes = resource.type.isCompound() ? |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1221 |
types.interfaces(resource.type).prepend(types.supertype(resource.type)) : |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1222 |
List.of(resource.type); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1223 |
for (Type sup : closeableSupertypes) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1224 |
if (types.asSuper(sup, syms.autoCloseableType.tsym) != null) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1225 |
Symbol closeMethod = rs.resolveQualifiedMethod(tree, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1226 |
attrEnv, |
41156
251471aec877
8163027: AssertionError while compiling a program that uses try with resources.
sadayapalam
parents:
38509
diff
changeset
|
1227 |
types.skipTypeVars(sup, false), |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1228 |
names.close, |
42828
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
41854
diff
changeset
|
1229 |
List.nil(), |
cce89649f958
8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents:
41854
diff
changeset
|
1230 |
List.nil()); |
17998
02a5abb2ae2f
7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents:
17282
diff
changeset
|
1231 |
Type mt = types.memberType(resource.type, closeMethod); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1232 |
if (closeMethod.kind == MTH) { |
17998
02a5abb2ae2f
7179353: try-with-resources fails to compile with generic exception parameters
vromero
parents:
17282
diff
changeset
|
1233 |
for (Type t : mt.getThrownTypes()) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1234 |
markThrown(resource, t); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1235 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1236 |
} |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
3149
diff
changeset
|
1237 |
} |
10 | 1238 |
} |
1239 |
} |
|
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1240 |
scan(tree.body); |
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50468
diff
changeset
|
1241 |
List<Type> thrownInTry = chk.union(thrown, List.of(syms.runtimeExceptionType, syms.errorType)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1242 |
thrown = thrownPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1243 |
caught = caughtPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1244 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1245 |
List<Type> caughtInTry = List.nil(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1246 |
for (List<JCCatch> l = tree.catchers; l.nonEmpty(); l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1247 |
JCVariableDecl param = l.head.param; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1248 |
List<JCExpression> subClauses = TreeInfo.isMultiCatch(l.head) ? |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1249 |
((JCTypeUnion)l.head.param.vartype).alternatives : |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1250 |
List.of(l.head.param.vartype); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1251 |
List<Type> ctypes = List.nil(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1252 |
List<Type> rethrownTypes = chk.diff(thrownInTry, caughtInTry); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1253 |
for (JCExpression ct : subClauses) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1254 |
Type exc = ct.type; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1255 |
if (exc != syms.unknownType) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1256 |
ctypes = ctypes.append(exc); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1257 |
if (types.isSameType(exc, syms.objectType)) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1258 |
continue; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1259 |
checkCaughtType(l.head.pos(), exc, thrownInTry, caughtInTry); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1260 |
caughtInTry = chk.incl(exc, caughtInTry); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1261 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1262 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1263 |
scan(param); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1264 |
preciseRethrowTypes.put(param.sym, chk.intersect(ctypes, rethrownTypes)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1265 |
scan(l.head.body); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1266 |
preciseRethrowTypes.remove(param.sym); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1267 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1268 |
if (tree.finalizer != null) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1269 |
List<Type> savedThrown = thrown; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1270 |
thrown = List.nil(); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1271 |
ListBuffer<PendingExit> exits = pendingExits; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1272 |
pendingExits = prevPendingExits; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1273 |
scan(tree.finalizer); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1274 |
if (!tree.finallyCanCompleteNormally) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1275 |
// discard exits and exceptions from try and finally |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1276 |
thrown = chk.union(thrown, thrownPrev); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1277 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1278 |
thrown = chk.union(thrown, chk.diff(thrownInTry, caughtInTry)); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1279 |
thrown = chk.union(thrown, savedThrown); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1280 |
// FIX: this doesn't preserve source order of exits in catch |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1281 |
// versus finally! |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1282 |
while (exits.nonEmpty()) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1283 |
pendingExits.append(exits.next()); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1284 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1285 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1286 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1287 |
thrown = chk.union(thrown, chk.diff(thrownInTry, caughtInTry)); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1288 |
ListBuffer<PendingExit> exits = pendingExits; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1289 |
pendingExits = prevPendingExits; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1290 |
while (exits.nonEmpty()) pendingExits.append(exits.next()); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1291 |
} |
10 | 1292 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1293 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1294 |
@Override |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1295 |
public void visitIf(JCIf tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1296 |
scan(tree.cond); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1297 |
scan(tree.thenpart); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1298 |
if (tree.elsepart != null) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1299 |
scan(tree.elsepart); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1300 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1301 |
} |
10 | 1302 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1303 |
void checkCaughtType(DiagnosticPosition pos, Type exc, List<Type> thrownInTry, List<Type> caughtInTry) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1304 |
if (chk.subset(exc, caughtInTry)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
1305 |
log.error(pos, Errors.ExceptAlreadyCaught(exc)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1306 |
} else if (!chk.isUnchecked(pos, exc) && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1307 |
!isExceptionOrThrowable(exc) && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1308 |
!chk.intersects(exc, thrownInTry)) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
1309 |
log.error(pos, Errors.ExceptNeverThrownInTry(exc)); |
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50468
diff
changeset
|
1310 |
} else { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1311 |
List<Type> catchableThrownTypes = chk.intersect(List.of(exc), thrownInTry); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1312 |
// 'catchableThrownTypes' cannnot possibly be empty - if 'exc' was an |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1313 |
// unchecked exception, the result list would not be empty, as the augmented |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1314 |
// thrown set includes { RuntimeException, Error }; if 'exc' was a checked |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1315 |
// exception, that would have been covered in the branch above |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1316 |
if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty() && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1317 |
!isExceptionOrThrowable(exc)) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1318 |
Warning key = catchableThrownTypes.length() == 1 ? |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1319 |
Warnings.UnreachableCatch(catchableThrownTypes) : |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1320 |
Warnings.UnreachableCatch1(catchableThrownTypes); |
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1321 |
log.warning(pos, key); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1322 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1323 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1324 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1325 |
//where |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1326 |
private boolean isExceptionOrThrowable(Type exc) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1327 |
return exc.tsym == syms.throwableType.tsym || |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1328 |
exc.tsym == syms.exceptionType.tsym; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1329 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1330 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1331 |
public void visitBreak(JCBreak tree) { |
55306 | 1332 |
recordExit(new PendingExit(tree)); |
1333 |
} |
|
1334 |
||
1335 |
public void visitYield(JCYield tree) { |
|
1336 |
scan(tree.value); |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1337 |
recordExit(new PendingExit(tree)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1338 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1339 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1340 |
public void visitContinue(JCContinue tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1341 |
recordExit(new PendingExit(tree)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1342 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1343 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1344 |
public void visitReturn(JCReturn tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1345 |
scan(tree.expr); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1346 |
recordExit(new PendingExit(tree)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1347 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1348 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1349 |
public void visitThrow(JCThrow tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1350 |
scan(tree.expr); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1351 |
Symbol sym = TreeInfo.symbol(tree.expr); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1352 |
if (sym != null && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1353 |
sym.kind == VAR && |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1354 |
(sym.flags() & (FINAL | EFFECTIVELY_FINAL)) != 0 && |
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50468
diff
changeset
|
1355 |
preciseRethrowTypes.get(sym) != null) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1356 |
for (Type t : preciseRethrowTypes.get(sym)) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1357 |
markThrown(tree, t); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1358 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1359 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1360 |
else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1361 |
markThrown(tree, tree.expr.type); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1362 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1363 |
markDead(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1364 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1365 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1366 |
public void visitApply(JCMethodInvocation tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1367 |
scan(tree.meth); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1368 |
scan(tree.args); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1369 |
for (List<Type> l = tree.meth.type.getThrownTypes(); l.nonEmpty(); l = l.tail) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1370 |
markThrown(tree, l.head); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1371 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1372 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1373 |
public void visitNewClass(JCNewClass tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1374 |
scan(tree.encl); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1375 |
scan(tree.args); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1376 |
// scan(tree.def); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1377 |
for (List<Type> l = tree.constructorType.getThrownTypes(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1378 |
l.nonEmpty(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1379 |
l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1380 |
markThrown(tree, l.head); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1381 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1382 |
List<Type> caughtPrev = caught; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1383 |
try { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1384 |
// If the new class expression defines an anonymous class, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1385 |
// analysis of the anonymous constructor may encounter thrown |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1386 |
// types which are unsubstituted type variables. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1387 |
// However, since the constructor's actual thrown types have |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1388 |
// already been marked as thrown, it is safe to simply include |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1389 |
// each of the constructor's formal thrown types in the set of |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1390 |
// 'caught/declared to be thrown' types, for the duration of |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1391 |
// the class def analysis. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1392 |
if (tree.def != null) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1393 |
for (List<Type> l = tree.constructor.type.getThrownTypes(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1394 |
l.nonEmpty(); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1395 |
l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1396 |
caught = chk.incl(l.head, caught); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1397 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1398 |
scan(tree.def); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1399 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1400 |
finally { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1401 |
caught = caughtPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1402 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1403 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1404 |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1405 |
@Override |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1406 |
public void visitLambda(JCLambda tree) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1407 |
if (tree.type != null && |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1408 |
tree.type.isErroneous()) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1409 |
return; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1410 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1411 |
List<Type> prevCaught = caught; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1412 |
List<Type> prevThrown = thrown; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1413 |
ListBuffer<PendingExit> prevPending = pendingExits; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1414 |
try { |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19941
diff
changeset
|
1415 |
pendingExits = new ListBuffer<>(); |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1416 |
caught = tree.getDescriptorType(types).getThrownTypes(); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1417 |
thrown = List.nil(); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1418 |
scan(tree.body); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1419 |
List<PendingExit> exits = pendingExits.toList(); |
22163 | 1420 |
pendingExits = new ListBuffer<>(); |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1421 |
while (exits.nonEmpty()) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1422 |
PendingExit exit = exits.head; |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1423 |
exits = exits.tail; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1424 |
if (!(exit instanceof ThrownPendingExit)) { |
55306 | 1425 |
Assert.check(exit.tree.hasTag(RETURN) || |
1426 |
log.hasErrorOn(exit.tree.pos())); |
|
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1427 |
} else { |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1428 |
// uncaught throws will be reported later |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1429 |
pendingExits.append(exit); |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1430 |
} |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1431 |
} |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1432 |
|
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1433 |
errorUncaught(); |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1434 |
} finally { |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1435 |
pendingExits = prevPending; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1436 |
caught = prevCaught; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1437 |
thrown = prevThrown; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1438 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1439 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1440 |
|
36526 | 1441 |
public void visitModuleDef(JCModuleDecl tree) { |
1442 |
// Do nothing for modules |
|
1443 |
} |
|
1444 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1445 |
/************************************************************************** |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1446 |
* main method |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1447 |
*************************************************************************/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1448 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1449 |
/** Perform definite assignment/unassignment analysis on a tree. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1450 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1451 |
public void analyzeTree(Env<AttrContext> env, TreeMaker make) { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1452 |
analyzeTree(env, env.tree, make); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1453 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1454 |
public void analyzeTree(Env<AttrContext> env, JCTree tree, TreeMaker make) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1455 |
try { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1456 |
attrEnv = env; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1457 |
Flow.this.make = make; |
22163 | 1458 |
pendingExits = new ListBuffer<>(); |
1459 |
preciseRethrowTypes = new HashMap<>(); |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1460 |
this.thrown = this.caught = null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1461 |
this.classDef = null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1462 |
scan(tree); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1463 |
} finally { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1464 |
pendingExits = null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1465 |
Flow.this.make = null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1466 |
this.thrown = this.caught = null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1467 |
this.classDef = null; |
6594
d43f068fba19
6970584: Flow.java should be more error-friendly
mcimadamore
parents:
6156
diff
changeset
|
1468 |
} |
10 | 1469 |
} |
1470 |
} |
|
1471 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1472 |
/** |
41640
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1473 |
* Specialized pass that performs reachability analysis on a lambda |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1474 |
*/ |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1475 |
class LambdaAliveAnalyzer extends AliveAnalyzer { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1476 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1477 |
boolean inLambda; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1478 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1479 |
@Override |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1480 |
public void visitReturn(JCReturn tree) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1481 |
//ignore lambda return expression (which might not even be attributed) |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1482 |
recordExit(new PendingExit(tree)); |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1483 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1484 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1485 |
@Override |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1486 |
public void visitLambda(JCLambda tree) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1487 |
if (inLambda || tree.getBodyKind() == BodyKind.EXPRESSION) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1488 |
return; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1489 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1490 |
inLambda = true; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1491 |
try { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1492 |
super.visitLambda(tree); |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1493 |
} finally { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1494 |
inLambda = false; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1495 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1496 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1497 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1498 |
@Override |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1499 |
public void visitClassDef(JCClassDecl tree) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1500 |
//skip |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1501 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1502 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1503 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1504 |
/** |
59285
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1505 |
* Determine if alive after the given tree. |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1506 |
*/ |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1507 |
class SnippetAliveAnalyzer extends AliveAnalyzer { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1508 |
@Override |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1509 |
public void visitClassDef(JCClassDecl tree) { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1510 |
//skip |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1511 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1512 |
public boolean isAlive() { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1513 |
return super.alive != Liveness.DEAD; |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1514 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1515 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1516 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1517 |
class SnippetBreakAnalyzer extends AliveAnalyzer { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1518 |
private final JCTree loop; |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1519 |
private boolean breaksOut; |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1520 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1521 |
public SnippetBreakAnalyzer(JCTree loop) { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1522 |
this.loop = loop; |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1523 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1524 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1525 |
@Override |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1526 |
public void visitBreak(JCBreak tree) { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1527 |
breaksOut |= (super.alive == Liveness.ALIVE && tree.target == loop); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1528 |
super.visitBreak(tree); |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1529 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1530 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1531 |
public boolean breaksOut() { |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1532 |
return breaksOut; |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1533 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1534 |
} |
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1535 |
|
7799a51dbe30
8231826: Implement javac changes for pattern matching for instanceof
jlahoda
parents:
55306
diff
changeset
|
1536 |
/** |
41640
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1537 |
* Specialized pass that performs DA/DU on a lambda |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1538 |
*/ |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1539 |
class LambdaAssignAnalyzer extends AssignAnalyzer { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1540 |
WriteableScope enclosedSymbols; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1541 |
boolean inLambda; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1542 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1543 |
LambdaAssignAnalyzer(Env<AttrContext> env) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1544 |
enclosedSymbols = WriteableScope.create(env.enclClass.sym); |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1545 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1546 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1547 |
@Override |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1548 |
public void visitLambda(JCLambda tree) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1549 |
if (inLambda) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1550 |
return; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1551 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1552 |
inLambda = true; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1553 |
try { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1554 |
super.visitLambda(tree); |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1555 |
} finally { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1556 |
inLambda = false; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1557 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1558 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1559 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1560 |
@Override |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1561 |
public void visitVarDef(JCVariableDecl tree) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1562 |
enclosedSymbols.enter(tree.sym); |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1563 |
super.visitVarDef(tree); |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1564 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1565 |
@Override |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1566 |
protected boolean trackable(VarSymbol sym) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1567 |
return enclosedSymbols.includes(sym) && |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1568 |
sym.owner.kind == MTH; |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1569 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1570 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1571 |
@Override |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1572 |
public void visitClassDef(JCClassDecl tree) { |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1573 |
//skip |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1574 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1575 |
} |
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1576 |
|
0c5bdda9ac56
8168480: Speculative attribution of lambda causes NPE in Flow
mcimadamore
parents:
41156
diff
changeset
|
1577 |
/** |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1578 |
* Specialized pass that performs inference of thrown types for lambdas. |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1579 |
*/ |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1580 |
class LambdaFlowAnalyzer extends FlowAnalyzer { |
19933 | 1581 |
List<Type> inferredThrownTypes; |
1582 |
boolean inLambda; |
|
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1583 |
@Override |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1584 |
public void visitLambda(JCLambda tree) { |
19933 | 1585 |
if ((tree.type != null && |
1586 |
tree.type.isErroneous()) || inLambda) { |
|
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1587 |
return; |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1588 |
} |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1589 |
List<Type> prevCaught = caught; |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1590 |
List<Type> prevThrown = thrown; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1591 |
ListBuffer<PendingExit> prevPending = pendingExits; |
19933 | 1592 |
inLambda = true; |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1593 |
try { |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19941
diff
changeset
|
1594 |
pendingExits = new ListBuffer<>(); |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1595 |
caught = List.of(syms.throwableType); |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1596 |
thrown = List.nil(); |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1597 |
scan(tree.body); |
19933 | 1598 |
inferredThrownTypes = thrown; |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1599 |
} finally { |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1600 |
pendingExits = prevPending; |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1601 |
caught = prevCaught; |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1602 |
thrown = prevThrown; |
19933 | 1603 |
inLambda = false; |
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1604 |
} |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1605 |
} |
19933 | 1606 |
@Override |
1607 |
public void visitClassDef(JCClassDecl tree) { |
|
1608 |
//skip |
|
1609 |
} |
|
19502
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1610 |
} |
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1611 |
|
f30b3ef165ea
8015809: More user friendly compile-time errors for uncaught exceptions in lambda expression
jlahoda
parents:
19122
diff
changeset
|
1612 |
/** |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1613 |
* This pass implements (i) definite assignment analysis, which ensures that |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1614 |
* each variable is assigned when used and (ii) definite unassignment analysis, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1615 |
* which ensures that no final variable is assigned more than once. This visitor |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1616 |
* depends on the results of the liveliness analyzer. This pass is also used to mark |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1617 |
* effectively-final local variables/parameters. |
10 | 1618 |
*/ |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1619 |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1620 |
public class AssignAnalyzer extends BaseAnalyzer { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1621 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1622 |
/** The set of definitely assigned variables. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1623 |
*/ |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1624 |
final Bits inits; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1625 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1626 |
/** The set of definitely unassigned variables. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1627 |
*/ |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1628 |
final Bits uninits; |
10 | 1629 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1630 |
/** The set of variables that are definitely unassigned everywhere |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1631 |
* in current try block. This variable is maintained lazily; it is |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1632 |
* updated only when something gets removed from uninits, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1633 |
* typically by being assigned in reachable code. To obtain the |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1634 |
* correct set of variables which are definitely unassigned |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1635 |
* anywhere in current try block, intersect uninitsTry and |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1636 |
* uninits. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1637 |
*/ |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1638 |
final Bits uninitsTry; |
10 | 1639 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1640 |
/** When analyzing a condition, inits and uninits are null. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1641 |
* Instead we have: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1642 |
*/ |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1643 |
final Bits initsWhenTrue; |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1644 |
final Bits initsWhenFalse; |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1645 |
final Bits uninitsWhenTrue; |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1646 |
final Bits uninitsWhenFalse; |
10 | 1647 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1648 |
/** A mapping from addresses to variable symbols. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1649 |
*/ |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1650 |
protected JCVariableDecl[] vardecls; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1651 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1652 |
/** The current class being defined. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1653 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1654 |
JCClassDecl classDef; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1655 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1656 |
/** The first variable sequence number in this class definition. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1657 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1658 |
int firstadr; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1659 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1660 |
/** The next available variable sequence number. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1661 |
*/ |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1662 |
protected int nextadr; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1663 |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1664 |
/** The first variable sequence number in a block that can return. |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1665 |
*/ |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1666 |
protected int returnadr; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1667 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1668 |
/** The list of unreferenced automatic resources. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1669 |
*/ |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
24610
diff
changeset
|
1670 |
WriteableScope unrefdResources; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1671 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1672 |
/** Modified when processing a loop body the second time for DU analysis. */ |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1673 |
FlowKind flowKind = FlowKind.NORMAL; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1674 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1675 |
/** The starting position of the analyzed tree */ |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1676 |
int startPos; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1677 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1678 |
public class AssignPendingExit extends BaseAnalyzer.PendingExit { |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1679 |
|
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1680 |
final Bits inits; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1681 |
final Bits uninits; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1682 |
final Bits exit_inits = new Bits(true); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1683 |
final Bits exit_uninits = new Bits(true); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1684 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1685 |
public AssignPendingExit(JCTree tree, final Bits inits, final Bits uninits) { |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1686 |
super(tree); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1687 |
this.inits = inits; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1688 |
this.uninits = uninits; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1689 |
this.exit_inits.assign(inits); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1690 |
this.exit_uninits.assign(uninits); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1691 |
} |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1692 |
|
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1693 |
@Override |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1694 |
public void resolveJump() { |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1695 |
inits.andSet(exit_inits); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1696 |
uninits.andSet(exit_uninits); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1697 |
} |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1698 |
} |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1699 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1700 |
public AssignAnalyzer() { |
26537
026471c1a12b
8042347: javac, Gen.LVTAssignAnalyzer should be refactored, it shouldn't be a static class
vromero
parents:
26536
diff
changeset
|
1701 |
this.inits = new Bits(); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1702 |
uninits = new Bits(); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1703 |
uninitsTry = new Bits(); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1704 |
initsWhenTrue = new Bits(true); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1705 |
initsWhenFalse = new Bits(true); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1706 |
uninitsWhenTrue = new Bits(true); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1707 |
uninitsWhenFalse = new Bits(true); |
10 | 1708 |
} |
1709 |
||
22166
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1710 |
private boolean isInitialConstructor = false; |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1711 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1712 |
@Override |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1713 |
protected void markDead() { |
22166
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1714 |
if (!isInitialConstructor) { |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1715 |
inits.inclRange(returnadr, nextadr); |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1716 |
} else { |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1717 |
for (int address = returnadr; address < nextadr; address++) { |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1718 |
if (!(isFinalUninitializedStaticField(vardecls[address].sym))) { |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1719 |
inits.incl(address); |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1720 |
} |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1721 |
} |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1722 |
} |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
1723 |
uninits.inclRange(returnadr, nextadr); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1724 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1725 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1726 |
/*-------------- Processing variables ----------------------*/ |
10 | 1727 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1728 |
/** Do we need to track init/uninit state of this symbol? |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1729 |
* I.e. is symbol either a local or a blank final variable? |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1730 |
*/ |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1731 |
protected boolean trackable(VarSymbol sym) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1732 |
return |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1733 |
sym.pos >= startPos && |
52936
9745e4e36dd1
8214114: Switch expressions with try-catch statements
jlahoda
parents:
52794
diff
changeset
|
1734 |
((sym.owner.kind == MTH || sym.owner.kind == VAR || |
22166
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1735 |
isFinalUninitializedField(sym))); |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1736 |
} |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1737 |
|
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1738 |
boolean isFinalUninitializedField(VarSymbol sym) { |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1739 |
return sym.owner.kind == TYP && |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1740 |
((sym.flags() & (FINAL | HASINIT | PARAMETER)) == FINAL && |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1741 |
classDef.sym.isEnclosedBy((ClassSymbol)sym.owner)); |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1742 |
} |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1743 |
|
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1744 |
boolean isFinalUninitializedStaticField(VarSymbol sym) { |
adc980c0dbcc
8030218: javac, compile time error isn't shown when final static field is not assigned, follow-up
vromero
parents:
22165
diff
changeset
|
1745 |
return isFinalUninitializedField(sym) && sym.isStatic(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1746 |
} |
10 | 1747 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1748 |
/** Initialize new trackable variable by setting its address field |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1749 |
* to the next available sequence number and entering it under that |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1750 |
* index into the vars array. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1751 |
*/ |
19122
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
1752 |
void newVar(JCVariableDecl varDecl) { |
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
1753 |
VarSymbol sym = varDecl.sym; |
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
1754 |
vardecls = ArrayUtils.ensureCapacity(vardecls, nextadr); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1755 |
if ((sym.flags() & FINAL) == 0) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1756 |
sym.flags_field |= EFFECTIVELY_FINAL; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1757 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1758 |
sym.adr = nextadr; |
19122
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
1759 |
vardecls[nextadr] = varDecl; |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1760 |
inits.excl(nextadr); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1761 |
uninits.incl(nextadr); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1762 |
nextadr++; |
10 | 1763 |
} |
1764 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1765 |
/** Record an initialization of a trackable variable. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1766 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1767 |
void letInit(DiagnosticPosition pos, VarSymbol sym) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1768 |
if (sym.adr >= firstadr && trackable(sym)) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1769 |
if ((sym.flags() & EFFECTIVELY_FINAL) != 0) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1770 |
if (!uninits.isMember(sym.adr)) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1771 |
//assignment targeting an effectively final variable |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1772 |
//makes the variable lose its status of effectively final |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1773 |
//if the variable is _not_ definitively unassigned |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1774 |
sym.flags_field &= ~EFFECTIVELY_FINAL; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1775 |
} else { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1776 |
uninit(sym); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1777 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1778 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1779 |
else if ((sym.flags() & FINAL) != 0) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1780 |
if ((sym.flags() & PARAMETER) != 0) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1781 |
if ((sym.flags() & UNION) != 0) { //multi-catch parameter |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
1782 |
log.error(pos, Errors.MulticatchParameterMayNotBeAssigned(sym)); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1783 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1784 |
else { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
1785 |
log.error(pos, |
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
1786 |
Errors.FinalParameterMayNotBeAssigned(sym)); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1787 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1788 |
} else if (!uninits.isMember(sym.adr)) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1789 |
log.error(pos, diags.errorKey(flowKind.errKey, sym)); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1790 |
} else { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1791 |
uninit(sym); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1792 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1793 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1794 |
inits.incl(sym.adr); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1795 |
} else if ((sym.flags() & FINAL) != 0) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
1796 |
log.error(pos, Errors.VarMightAlreadyBeAssigned(sym)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1797 |
} |
10 | 1798 |
} |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1799 |
//where |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1800 |
void uninit(VarSymbol sym) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1801 |
if (!inits.isMember(sym.adr)) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1802 |
// reachable assignment |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1803 |
uninits.excl(sym.adr); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1804 |
uninitsTry.excl(sym.adr); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1805 |
} else { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1806 |
//log.rawWarning(pos, "unreachable assignment");//DEBUG |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1807 |
uninits.excl(sym.adr); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1808 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
1809 |
} |
10 | 1810 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1811 |
/** If tree is either a simple name or of the form this.name or |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1812 |
* C.this.name, and tree represents a trackable variable, |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1813 |
* record an initialization of the variable. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1814 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1815 |
void letInit(JCTree tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1816 |
tree = TreeInfo.skipParens(tree); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1817 |
if (tree.hasTag(IDENT) || tree.hasTag(SELECT)) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1818 |
Symbol sym = TreeInfo.symbol(tree); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1819 |
if (sym.kind == VAR) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1820 |
letInit(tree.pos(), (VarSymbol)sym); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1821 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1822 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1823 |
} |
10 | 1824 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1825 |
/** Check that trackable variable is initialized. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1826 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1827 |
void checkInit(DiagnosticPosition pos, VarSymbol sym) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1828 |
checkInit(pos, sym, Errors.VarMightNotHaveBeenInitialized(sym)); |
19122
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
1829 |
} |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1830 |
|
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1831 |
void checkInit(DiagnosticPosition pos, VarSymbol sym, Error errkey) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1832 |
if ((sym.adr >= firstadr || sym.owner.kind != TYP) && |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1833 |
trackable(sym) && |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1834 |
!inits.isMember(sym.adr)) { |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
1835 |
log.error(pos, errkey); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1836 |
inits.incl(sym.adr); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1837 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1838 |
} |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1839 |
|
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1840 |
/** Utility method to reset several Bits instances. |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1841 |
*/ |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1842 |
private void resetBits(Bits... bits) { |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1843 |
for (Bits b : bits) { |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1844 |
b.reset(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1845 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1846 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1847 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1848 |
/** Split (duplicate) inits/uninits into WhenTrue/WhenFalse sets |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1849 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1850 |
void split(boolean setToNull) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1851 |
initsWhenFalse.assign(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1852 |
uninitsWhenFalse.assign(uninits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1853 |
initsWhenTrue.assign(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1854 |
uninitsWhenTrue.assign(uninits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1855 |
if (setToNull) { |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1856 |
resetBits(inits, uninits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1857 |
} |
10 | 1858 |
} |
1859 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1860 |
/** Merge (intersect) inits/uninits from WhenTrue/WhenFalse sets. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1861 |
*/ |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1862 |
protected void merge() { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1863 |
inits.assign(initsWhenFalse.andSet(initsWhenTrue)); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1864 |
uninits.assign(uninitsWhenFalse.andSet(uninitsWhenTrue)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1865 |
} |
10 | 1866 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1867 |
/* ************************************************************************ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1868 |
* Visitor methods for statements and definitions |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1869 |
*************************************************************************/ |
10 | 1870 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1871 |
/** Analyze an expression. Make sure to set (un)inits rather than |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1872 |
* (un)initsWhenTrue(WhenFalse) on exit. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1873 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1874 |
void scanExpr(JCTree tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1875 |
if (tree != null) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1876 |
scan(tree); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1877 |
if (inits.isReset()) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1878 |
merge(); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1879 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1880 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1881 |
} |
10 | 1882 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1883 |
/** Analyze a list of expressions. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1884 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1885 |
void scanExprs(List<? extends JCExpression> trees) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1886 |
if (trees != null) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1887 |
for (List<? extends JCExpression> l = trees; l.nonEmpty(); l = l.tail) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1888 |
scanExpr(l.head); |
10 | 1889 |
} |
1890 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1891 |
/** Analyze a condition. Make sure to set (un)initsWhenTrue(WhenFalse) |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1892 |
* rather than (un)inits on exit. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1893 |
*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1894 |
void scanCond(JCTree tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1895 |
if (tree.type.isFalse()) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1896 |
if (inits.isReset()) merge(); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1897 |
initsWhenTrue.assign(inits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1898 |
initsWhenTrue.inclRange(firstadr, nextadr); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1899 |
uninitsWhenTrue.assign(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1900 |
uninitsWhenTrue.inclRange(firstadr, nextadr); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1901 |
initsWhenFalse.assign(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1902 |
uninitsWhenFalse.assign(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1903 |
} else if (tree.type.isTrue()) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1904 |
if (inits.isReset()) merge(); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1905 |
initsWhenFalse.assign(inits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1906 |
initsWhenFalse.inclRange(firstadr, nextadr); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1907 |
uninitsWhenFalse.assign(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1908 |
uninitsWhenFalse.inclRange(firstadr, nextadr); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1909 |
initsWhenTrue.assign(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1910 |
uninitsWhenTrue.assign(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1911 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1912 |
scan(tree); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1913 |
if (!inits.isReset()) |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1914 |
split(tree.type != syms.unknownType); |
10 | 1915 |
} |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1916 |
if (tree.type != syms.unknownType) { |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1917 |
resetBits(inits, uninits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
1918 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1919 |
} |
10 | 1920 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1921 |
/* ------------ Visitor methods for various sorts of trees -------------*/ |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1922 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1923 |
public void visitClassDef(JCClassDecl tree) { |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1924 |
if (tree.sym == null) { |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1925 |
return; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1926 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1927 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1928 |
Lint lintPrev = lint; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1929 |
lint = lint.augment(tree.sym); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1930 |
try { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1931 |
if (tree.sym == null) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1932 |
return; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1933 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1934 |
|
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1935 |
JCClassDecl classDefPrev = classDef; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1936 |
int firstadrPrev = firstadr; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1937 |
int nextadrPrev = nextadr; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
1938 |
ListBuffer<PendingExit> pendingExitsPrev = pendingExits; |
10 | 1939 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1940 |
pendingExits = new ListBuffer<>(); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1941 |
if (tree.name != names.empty) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1942 |
firstadr = nextadr; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1943 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1944 |
classDef = tree; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1945 |
try { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1946 |
// define all the static fields |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1947 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1948 |
if (l.head.hasTag(VARDEF)) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1949 |
JCVariableDecl def = (JCVariableDecl)l.head; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1950 |
if ((def.mods.flags & STATIC) != 0) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1951 |
VarSymbol sym = def.sym; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1952 |
if (trackable(sym)) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1953 |
newVar(def); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1954 |
} |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1955 |
} |
10 | 1956 |
} |
1957 |
} |
|
1958 |
||
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1959 |
// process all the static initializers |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1960 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1961 |
if (!l.head.hasTag(METHODDEF) && |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1962 |
(TreeInfo.flags(l.head) & STATIC) != 0) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1963 |
scan(l.head); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1964 |
} |
10 | 1965 |
} |
1966 |
||
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1967 |
// define all the instance fields |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1968 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1969 |
if (l.head.hasTag(VARDEF)) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1970 |
JCVariableDecl def = (JCVariableDecl)l.head; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1971 |
if ((def.mods.flags & STATIC) == 0) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1972 |
VarSymbol sym = def.sym; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1973 |
if (trackable(sym)) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1974 |
newVar(def); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1975 |
} |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
1976 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1977 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1978 |
} |
10 | 1979 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1980 |
// process all the instance initializers |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1981 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1982 |
if (!l.head.hasTag(METHODDEF) && |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1983 |
(TreeInfo.flags(l.head) & STATIC) == 0) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1984 |
scan(l.head); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1985 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1986 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
1987 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1988 |
// process all the methods |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1989 |
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1990 |
if (l.head.hasTag(METHODDEF)) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1991 |
scan(l.head); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1992 |
} |
10 | 1993 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1994 |
} finally { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1995 |
pendingExits = pendingExitsPrev; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1996 |
nextadr = nextadrPrev; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1997 |
firstadr = firstadrPrev; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
1998 |
classDef = classDefPrev; |
10 | 1999 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2000 |
} finally { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2001 |
lint = lintPrev; |
10 | 2002 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2003 |
} |
10 | 2004 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2005 |
public void visitMethodDef(JCMethodDecl tree) { |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2006 |
if (tree.body == null) { |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2007 |
return; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2008 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2009 |
|
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2010 |
/* MemberEnter can generate synthetic methods ignore them |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2011 |
*/ |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2012 |
if ((tree.sym.flags() & SYNTHETIC) != 0) { |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2013 |
return; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2014 |
} |
10 | 2015 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2016 |
Lint lintPrev = lint; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2017 |
lint = lint.augment(tree.sym); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2018 |
try { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2019 |
if (tree.body == null) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2020 |
return; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2021 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2022 |
/* Ignore synthetic methods, except for translated lambda methods. |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2023 |
*/ |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2024 |
if ((tree.sym.flags() & (SYNTHETIC | LAMBDA_METHOD)) == SYNTHETIC) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2025 |
return; |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2026 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2027 |
|
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2028 |
final Bits initsPrev = new Bits(inits); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2029 |
final Bits uninitsPrev = new Bits(uninits); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2030 |
int nextadrPrev = nextadr; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2031 |
int firstadrPrev = firstadr; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2032 |
int returnadrPrev = returnadr; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2033 |
|
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2034 |
Assert.check(pendingExits.isEmpty()); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2035 |
boolean lastInitialConstructor = isInitialConstructor; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2036 |
try { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2037 |
isInitialConstructor = TreeInfo.isInitialConstructor(tree); |
10 | 2038 |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2039 |
if (!isInitialConstructor) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2040 |
firstadr = nextadr; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2041 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2042 |
for (List<JCVariableDecl> l = tree.params; l.nonEmpty(); l = l.tail) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2043 |
JCVariableDecl def = l.head; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2044 |
scan(def); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2045 |
Assert.check((def.sym.flags() & PARAMETER) != 0, "Method parameter without PARAMETER flag"); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2046 |
/* If we are executing the code from Gen, then there can be |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2047 |
* synthetic or mandated variables, ignore them. |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2048 |
*/ |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2049 |
initParam(def); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2050 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2051 |
// else we are in an instance initializer block; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2052 |
// leave caught unchanged. |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2053 |
scan(tree.body); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2054 |
|
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2055 |
if (isInitialConstructor) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2056 |
boolean isSynthesized = (tree.sym.flags() & |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2057 |
GENERATEDCONSTR) != 0; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2058 |
for (int i = firstadr; i < nextadr; i++) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2059 |
JCVariableDecl vardecl = vardecls[i]; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2060 |
VarSymbol var = vardecl.sym; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2061 |
if (var.owner == classDef.sym) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2062 |
// choose the diagnostic position based on whether |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2063 |
// the ctor is default(synthesized) or not |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2064 |
if (isSynthesized) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2065 |
checkInit(TreeInfo.diagnosticPositionFor(var, vardecl), |
48721
ef3557eb4306
8196403: remove the remaining use of string keys for errors and warnings in the compiler
vromero
parents:
48054
diff
changeset
|
2066 |
var, Errors.VarNotInitializedInDefaultConstructor(var)); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2067 |
} else { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2068 |
checkInit(TreeInfo.diagEndPos(tree.body), var); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2069 |
} |
19122
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
2070 |
} |
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
2071 |
} |
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
2072 |
} |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2073 |
List<PendingExit> exits = pendingExits.toList(); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2074 |
pendingExits = new ListBuffer<>(); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2075 |
while (exits.nonEmpty()) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2076 |
PendingExit exit = exits.head; |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2077 |
exits = exits.tail; |
55306 | 2078 |
Assert.check(exit.tree.hasTag(RETURN) || |
2079 |
log.hasErrorOn(exit.tree.pos()), |
|
2080 |
exit.tree); |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2081 |
if (isInitialConstructor) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2082 |
Assert.check(exit instanceof AssignPendingExit); |
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2083 |
inits.assign(((AssignPendingExit) exit).exit_inits); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2084 |
for (int i = firstadr; i < nextadr; i++) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2085 |
checkInit(exit.tree.pos(), vardecls[i].sym); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2086 |
} |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2087 |
} |
10 | 2088 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2089 |
} finally { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2090 |
inits.assign(initsPrev); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2091 |
uninits.assign(uninitsPrev); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2092 |
nextadr = nextadrPrev; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2093 |
firstadr = firstadrPrev; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2094 |
returnadr = returnadrPrev; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2095 |
isInitialConstructor = lastInitialConstructor; |
10 | 2096 |
} |
2097 |
} finally { |
|
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2098 |
lint = lintPrev; |
10 | 2099 |
} |
2100 |
} |
|
2101 |
||
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2102 |
protected void initParam(JCVariableDecl def) { |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2103 |
inits.incl(def.sym.adr); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2104 |
uninits.excl(def.sym.adr); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2105 |
} |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2106 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2107 |
public void visitVarDef(JCVariableDecl tree) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2108 |
Lint lintPrev = lint; |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2109 |
lint = lint.augment(tree.sym); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2110 |
try{ |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2111 |
boolean track = trackable(tree.sym); |
52936
9745e4e36dd1
8214114: Switch expressions with try-catch statements
jlahoda
parents:
52794
diff
changeset
|
2112 |
if (track && (tree.sym.owner.kind == MTH || tree.sym.owner.kind == VAR)) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2113 |
newVar(tree); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2114 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2115 |
if (tree.init != null) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2116 |
scanExpr(tree.init); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2117 |
if (track) { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2118 |
letInit(tree.pos(), tree.sym); |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2119 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2120 |
} |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2121 |
} finally { |
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2122 |
lint = lintPrev; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2123 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2124 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2125 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2126 |
public void visitBlock(JCBlock tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2127 |
int nextadrPrev = nextadr; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2128 |
scan(tree.stats); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2129 |
nextadr = nextadrPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2130 |
} |
10 | 2131 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2132 |
public void visitDoLoop(JCDoWhileLoop tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2133 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2134 |
FlowKind prevFlowKind = flowKind; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2135 |
flowKind = FlowKind.NORMAL; |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2136 |
final Bits initsSkip = new Bits(true); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2137 |
final Bits uninitsSkip = new Bits(true); |
22163 | 2138 |
pendingExits = new ListBuffer<>(); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2139 |
int prevErrors = log.nerrors; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2140 |
do { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2141 |
final Bits uninitsEntry = new Bits(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2142 |
uninitsEntry.excludeFrom(nextadr); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2143 |
scan(tree.body); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2144 |
resolveContinues(tree); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2145 |
scanCond(tree.cond); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2146 |
if (!flowKind.isFinal()) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2147 |
initsSkip.assign(initsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2148 |
uninitsSkip.assign(uninitsWhenFalse); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2149 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2150 |
if (log.nerrors != prevErrors || |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2151 |
flowKind.isFinal() || |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2152 |
new Bits(uninitsEntry).diffSet(uninitsWhenTrue).nextBit(firstadr)==-1) |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2153 |
break; |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2154 |
inits.assign(initsWhenTrue); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2155 |
uninits.assign(uninitsEntry.andSet(uninitsWhenTrue)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2156 |
flowKind = FlowKind.SPECULATIVE_LOOP; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2157 |
} while (true); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2158 |
flowKind = prevFlowKind; |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2159 |
inits.assign(initsSkip); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2160 |
uninits.assign(uninitsSkip); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2161 |
resolveBreaks(tree, prevPendingExits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2162 |
} |
10 | 2163 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2164 |
public void visitWhileLoop(JCWhileLoop tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2165 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2166 |
FlowKind prevFlowKind = flowKind; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2167 |
flowKind = FlowKind.NORMAL; |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2168 |
final Bits initsSkip = new Bits(true); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2169 |
final Bits uninitsSkip = new Bits(true); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2170 |
pendingExits = new ListBuffer<>(); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2171 |
int prevErrors = log.nerrors; |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2172 |
final Bits uninitsEntry = new Bits(uninits); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2173 |
uninitsEntry.excludeFrom(nextadr); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2174 |
do { |
10 | 2175 |
scanCond(tree.cond); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2176 |
if (!flowKind.isFinal()) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2177 |
initsSkip.assign(initsWhenFalse) ; |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2178 |
uninitsSkip.assign(uninitsWhenFalse); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2179 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2180 |
inits.assign(initsWhenTrue); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2181 |
uninits.assign(uninitsWhenTrue); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2182 |
scan(tree.body); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2183 |
resolveContinues(tree); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2184 |
if (log.nerrors != prevErrors || |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2185 |
flowKind.isFinal() || |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2186 |
new Bits(uninitsEntry).diffSet(uninits).nextBit(firstadr) == -1) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2187 |
break; |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2188 |
} |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2189 |
uninits.assign(uninitsEntry.andSet(uninits)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2190 |
flowKind = FlowKind.SPECULATIVE_LOOP; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2191 |
} while (true); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2192 |
flowKind = prevFlowKind; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2193 |
//a variable is DA/DU after the while statement, if it's DA/DU assuming the |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2194 |
//branch is not taken AND if it's DA/DU before any break statement |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2195 |
inits.assign(initsSkip); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2196 |
uninits.assign(uninitsSkip); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2197 |
resolveBreaks(tree, prevPendingExits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2198 |
} |
10 | 2199 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2200 |
public void visitForLoop(JCForLoop tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2201 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2202 |
FlowKind prevFlowKind = flowKind; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2203 |
flowKind = FlowKind.NORMAL; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2204 |
int nextadrPrev = nextadr; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2205 |
scan(tree.init); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2206 |
final Bits initsSkip = new Bits(true); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2207 |
final Bits uninitsSkip = new Bits(true); |
22163 | 2208 |
pendingExits = new ListBuffer<>(); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2209 |
int prevErrors = log.nerrors; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2210 |
do { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2211 |
final Bits uninitsEntry = new Bits(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2212 |
uninitsEntry.excludeFrom(nextadr); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2213 |
if (tree.cond != null) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2214 |
scanCond(tree.cond); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2215 |
if (!flowKind.isFinal()) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2216 |
initsSkip.assign(initsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2217 |
uninitsSkip.assign(uninitsWhenFalse); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2218 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2219 |
inits.assign(initsWhenTrue); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2220 |
uninits.assign(uninitsWhenTrue); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2221 |
} else if (!flowKind.isFinal()) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2222 |
initsSkip.assign(inits); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2223 |
initsSkip.inclRange(firstadr, nextadr); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2224 |
uninitsSkip.assign(uninits); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2225 |
uninitsSkip.inclRange(firstadr, nextadr); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2226 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2227 |
scan(tree.body); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2228 |
resolveContinues(tree); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2229 |
scan(tree.step); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2230 |
if (log.nerrors != prevErrors || |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2231 |
flowKind.isFinal() || |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2232 |
new Bits(uninitsEntry).diffSet(uninits).nextBit(firstadr) == -1) |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2233 |
break; |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2234 |
uninits.assign(uninitsEntry.andSet(uninits)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2235 |
flowKind = FlowKind.SPECULATIVE_LOOP; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2236 |
} while (true); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2237 |
flowKind = prevFlowKind; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2238 |
//a variable is DA/DU after a for loop, if it's DA/DU assuming the |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2239 |
//branch is not taken AND if it's DA/DU before any break statement |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2240 |
inits.assign(initsSkip); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2241 |
uninits.assign(uninitsSkip); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2242 |
resolveBreaks(tree, prevPendingExits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2243 |
nextadr = nextadrPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2244 |
} |
10 | 2245 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2246 |
public void visitForeachLoop(JCEnhancedForLoop tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2247 |
visitVarDef(tree.var); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2248 |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2249 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2250 |
FlowKind prevFlowKind = flowKind; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2251 |
flowKind = FlowKind.NORMAL; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2252 |
int nextadrPrev = nextadr; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2253 |
scan(tree.expr); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2254 |
final Bits initsStart = new Bits(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2255 |
final Bits uninitsStart = new Bits(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2256 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2257 |
letInit(tree.pos(), tree.var.sym); |
22163 | 2258 |
pendingExits = new ListBuffer<>(); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2259 |
int prevErrors = log.nerrors; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2260 |
do { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2261 |
final Bits uninitsEntry = new Bits(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2262 |
uninitsEntry.excludeFrom(nextadr); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2263 |
scan(tree.body); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2264 |
resolveContinues(tree); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2265 |
if (log.nerrors != prevErrors || |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2266 |
flowKind.isFinal() || |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2267 |
new Bits(uninitsEntry).diffSet(uninits).nextBit(firstadr) == -1) |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2268 |
break; |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2269 |
uninits.assign(uninitsEntry.andSet(uninits)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2270 |
flowKind = FlowKind.SPECULATIVE_LOOP; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2271 |
} while (true); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2272 |
flowKind = prevFlowKind; |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2273 |
inits.assign(initsStart); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2274 |
uninits.assign(uninitsStart.andSet(uninits)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2275 |
resolveBreaks(tree, prevPendingExits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2276 |
nextadr = nextadrPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2277 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2278 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2279 |
public void visitLabelled(JCLabeledStatement tree) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2280 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
22163 | 2281 |
pendingExits = new ListBuffer<>(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2282 |
scan(tree.body); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2283 |
resolveBreaks(tree, prevPendingExits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2284 |
} |
10 | 2285 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2286 |
public void visitSwitch(JCSwitch tree) { |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2287 |
handleSwitch(tree, tree.selector, tree.cases); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2288 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2289 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2290 |
public void visitSwitchExpression(JCSwitchExpression tree) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2291 |
handleSwitch(tree, tree.selector, tree.cases); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2292 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2293 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2294 |
private void handleSwitch(JCTree tree, JCExpression selector, List<JCCase> cases) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2295 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2296 |
pendingExits = new ListBuffer<>(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2297 |
int nextadrPrev = nextadr; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2298 |
scanExpr(selector); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2299 |
final Bits initsSwitch = new Bits(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2300 |
final Bits uninitsSwitch = new Bits(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2301 |
boolean hasDefault = false; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2302 |
for (List<JCCase> l = cases; l.nonEmpty(); l = l.tail) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2303 |
inits.assign(initsSwitch); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2304 |
uninits.assign(uninits.andSet(uninitsSwitch)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2305 |
JCCase c = l.head; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2306 |
if (c.pats.isEmpty()) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2307 |
hasDefault = true; |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2308 |
} else { |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2309 |
for (JCExpression pat : c.pats) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2310 |
scanExpr(pat); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2311 |
} |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2312 |
} |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2313 |
if (hasDefault) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2314 |
inits.assign(initsSwitch); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2315 |
uninits.assign(uninits.andSet(uninitsSwitch)); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2316 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2317 |
scan(c.stats); |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2318 |
if (c.completesNormally && c.caseKind == JCCase.RULE) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2319 |
scanSyntheticBreak(make, tree); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2320 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2321 |
addVars(c.stats, initsSwitch, uninitsSwitch); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2322 |
if (!hasDefault) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2323 |
inits.assign(initsSwitch); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2324 |
uninits.assign(uninits.andSet(uninitsSwitch)); |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2325 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2326 |
// Warn about fall-through if lint switch fallthrough enabled. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2327 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2328 |
if (!hasDefault) { |
54321
c9a492ad1aed
8221413: javac does not recognize variable assigned in switch expression as DA
jlahoda
parents:
52936
diff
changeset
|
2329 |
if (tree.hasTag(SWITCH_EXPRESSION)) { |
c9a492ad1aed
8221413: javac does not recognize variable assigned in switch expression as DA
jlahoda
parents:
52936
diff
changeset
|
2330 |
markDead(); |
c9a492ad1aed
8221413: javac does not recognize variable assigned in switch expression as DA
jlahoda
parents:
52936
diff
changeset
|
2331 |
} else { |
c9a492ad1aed
8221413: javac does not recognize variable assigned in switch expression as DA
jlahoda
parents:
52936
diff
changeset
|
2332 |
inits.andSet(initsSwitch); |
c9a492ad1aed
8221413: javac does not recognize variable assigned in switch expression as DA
jlahoda
parents:
52936
diff
changeset
|
2333 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2334 |
} |
55306 | 2335 |
if (tree.hasTag(SWITCH_EXPRESSION)) { |
2336 |
resolveYields(tree, prevPendingExits); |
|
2337 |
} else { |
|
2338 |
resolveBreaks(tree, prevPendingExits); |
|
2339 |
} |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2340 |
nextadr = nextadrPrev; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2341 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2342 |
// where |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2343 |
/** Add any variables defined in stats to inits and uninits. */ |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2344 |
private void addVars(List<JCStatement> stats, final Bits inits, |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2345 |
final Bits uninits) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2346 |
for (;stats.nonEmpty(); stats = stats.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2347 |
JCTree stat = stats.head; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2348 |
if (stat.hasTag(VARDEF)) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2349 |
int adr = ((JCVariableDecl) stat).sym.adr; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2350 |
inits.excl(adr); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2351 |
uninits.incl(adr); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2352 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2353 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2354 |
} |
10 | 2355 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2356 |
public void visitTry(JCTry tree) { |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19941
diff
changeset
|
2357 |
ListBuffer<JCVariableDecl> resourceVarDecls = new ListBuffer<>(); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2358 |
final Bits uninitsTryPrev = new Bits(uninitsTry); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2359 |
ListBuffer<PendingExit> prevPendingExits = pendingExits; |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2360 |
pendingExits = new ListBuffer<>(); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2361 |
final Bits initsTry = new Bits(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2362 |
uninitsTry.assign(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2363 |
for (JCTree resource : tree.resources) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2364 |
if (resource instanceof JCVariableDecl) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2365 |
JCVariableDecl vdecl = (JCVariableDecl) resource; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2366 |
visitVarDef(vdecl); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2367 |
unrefdResources.enter(vdecl.sym); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2368 |
resourceVarDecls.append(vdecl); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2369 |
} else if (resource instanceof JCExpression) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2370 |
scanExpr((JCExpression) resource); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2371 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2372 |
throw new AssertionError(tree); // parser error |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2373 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2374 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2375 |
scan(tree.body); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2376 |
uninitsTry.andSet(uninits); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2377 |
final Bits initsEnd = new Bits(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2378 |
final Bits uninitsEnd = new Bits(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2379 |
int nextadrCatch = nextadr; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2380 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2381 |
if (!resourceVarDecls.isEmpty() && |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2382 |
lint.isEnabled(Lint.LintCategory.TRY)) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2383 |
for (JCVariableDecl resVar : resourceVarDecls) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2384 |
if (unrefdResources.includes(resVar.sym)) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2385 |
log.warning(Lint.LintCategory.TRY, resVar.pos(), |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
2386 |
Warnings.TryResourceNotReferenced(resVar.sym)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2387 |
unrefdResources.remove(resVar.sym); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2388 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2389 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2390 |
} |
10 | 2391 |
|
18672
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2392 |
/* The analysis of each catch should be independent. |
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2393 |
* Each one should have the same initial values of inits and |
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2394 |
* uninits. |
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2395 |
*/ |
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2396 |
final Bits initsCatchPrev = new Bits(initsTry); |
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2397 |
final Bits uninitsCatchPrev = new Bits(uninitsTry); |
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2398 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2399 |
for (List<JCCatch> l = tree.catchers; l.nonEmpty(); l = l.tail) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2400 |
JCVariableDecl param = l.head.param; |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2401 |
inits.assign(initsCatchPrev); |
18672
1d6d1be0a94f
6326693: variable x might already have been assigned, when assignment is in catch block
vromero
parents:
18010
diff
changeset
|
2402 |
uninits.assign(uninitsCatchPrev); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2403 |
scan(param); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2404 |
/* If this is a TWR and we are executing the code from Gen, |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2405 |
* then there can be synthetic variables, ignore them. |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2406 |
*/ |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2407 |
initParam(param); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2408 |
scan(l.head.body); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2409 |
initsEnd.andSet(inits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2410 |
uninitsEnd.andSet(uninits); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2411 |
nextadr = nextadrCatch; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2412 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2413 |
if (tree.finalizer != null) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2414 |
inits.assign(initsTry); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2415 |
uninits.assign(uninitsTry); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2416 |
ListBuffer<PendingExit> exits = pendingExits; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2417 |
pendingExits = prevPendingExits; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2418 |
scan(tree.finalizer); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2419 |
if (!tree.finallyCanCompleteNormally) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2420 |
// discard exits and exceptions from try and finally |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2421 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2422 |
uninits.andSet(uninitsEnd); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2423 |
// FIX: this doesn't preserve source order of exits in catch |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2424 |
// versus finally! |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2425 |
while (exits.nonEmpty()) { |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2426 |
PendingExit exit = exits.next(); |
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2427 |
if (exit instanceof AssignPendingExit) { |
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2428 |
((AssignPendingExit) exit).exit_inits.orSet(inits); |
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2429 |
((AssignPendingExit) exit).exit_uninits.andSet(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2430 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2431 |
pendingExits.append(exit); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2432 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2433 |
inits.orSet(initsEnd); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2434 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2435 |
} else { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2436 |
inits.assign(initsEnd); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2437 |
uninits.assign(uninitsEnd); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2438 |
ListBuffer<PendingExit> exits = pendingExits; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2439 |
pendingExits = prevPendingExits; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2440 |
while (exits.nonEmpty()) pendingExits.append(exits.next()); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2441 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2442 |
uninitsTry.andSet(uninitsTryPrev).andSet(uninits); |
10 | 2443 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2444 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2445 |
public void visitConditional(JCConditional tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2446 |
scanCond(tree.cond); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2447 |
final Bits initsBeforeElse = new Bits(initsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2448 |
final Bits uninitsBeforeElse = new Bits(uninitsWhenFalse); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2449 |
inits.assign(initsWhenTrue); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2450 |
uninits.assign(uninitsWhenTrue); |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14259
diff
changeset
|
2451 |
if (tree.truepart.type.hasTag(BOOLEAN) && |
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14259
diff
changeset
|
2452 |
tree.falsepart.type.hasTag(BOOLEAN)) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2453 |
// if b and c are boolean valued, then |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2454 |
// v is (un)assigned after a?b:c when true iff |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2455 |
// v is (un)assigned after b when true and |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2456 |
// v is (un)assigned after c when true |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2457 |
scanCond(tree.truepart); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2458 |
final Bits initsAfterThenWhenTrue = new Bits(initsWhenTrue); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2459 |
final Bits initsAfterThenWhenFalse = new Bits(initsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2460 |
final Bits uninitsAfterThenWhenTrue = new Bits(uninitsWhenTrue); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2461 |
final Bits uninitsAfterThenWhenFalse = new Bits(uninitsWhenFalse); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2462 |
inits.assign(initsBeforeElse); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2463 |
uninits.assign(uninitsBeforeElse); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2464 |
scanCond(tree.falsepart); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2465 |
initsWhenTrue.andSet(initsAfterThenWhenTrue); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2466 |
initsWhenFalse.andSet(initsAfterThenWhenFalse); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2467 |
uninitsWhenTrue.andSet(uninitsAfterThenWhenTrue); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2468 |
uninitsWhenFalse.andSet(uninitsAfterThenWhenFalse); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2469 |
} else { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2470 |
scanExpr(tree.truepart); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2471 |
final Bits initsAfterThen = new Bits(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2472 |
final Bits uninitsAfterThen = new Bits(uninits); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2473 |
inits.assign(initsBeforeElse); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2474 |
uninits.assign(uninitsBeforeElse); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2475 |
scanExpr(tree.falsepart); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2476 |
inits.andSet(initsAfterThen); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2477 |
uninits.andSet(uninitsAfterThen); |
10 | 2478 |
} |
2479 |
} |
|
2480 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2481 |
public void visitIf(JCIf tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2482 |
scanCond(tree.cond); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2483 |
final Bits initsBeforeElse = new Bits(initsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2484 |
final Bits uninitsBeforeElse = new Bits(uninitsWhenFalse); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2485 |
inits.assign(initsWhenTrue); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2486 |
uninits.assign(uninitsWhenTrue); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2487 |
scan(tree.thenpart); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2488 |
if (tree.elsepart != null) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2489 |
final Bits initsAfterThen = new Bits(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2490 |
final Bits uninitsAfterThen = new Bits(uninits); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2491 |
inits.assign(initsBeforeElse); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2492 |
uninits.assign(uninitsBeforeElse); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2493 |
scan(tree.elsepart); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2494 |
inits.andSet(initsAfterThen); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2495 |
uninits.andSet(uninitsAfterThen); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5847
diff
changeset
|
2496 |
} else { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2497 |
inits.andSet(initsBeforeElse); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2498 |
uninits.andSet(uninitsBeforeElse); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5847
diff
changeset
|
2499 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5847
diff
changeset
|
2500 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5847
diff
changeset
|
2501 |
|
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2502 |
@Override |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2503 |
public void visitBreak(JCBreak tree) { |
55306 | 2504 |
recordExit(new AssignPendingExit(tree, inits, uninits)); |
2505 |
} |
|
2506 |
||
2507 |
@Override |
|
2508 |
public void visitYield(JCYield tree) { |
|
2509 |
JCSwitchExpression expr = (JCSwitchExpression) tree.target; |
|
2510 |
if (expr != null && expr.type.hasTag(BOOLEAN)) { |
|
2511 |
scanCond(tree.value); |
|
2512 |
Bits initsAfterBreakWhenTrue = new Bits(initsWhenTrue); |
|
2513 |
Bits initsAfterBreakWhenFalse = new Bits(initsWhenFalse); |
|
2514 |
Bits uninitsAfterBreakWhenTrue = new Bits(uninitsWhenTrue); |
|
2515 |
Bits uninitsAfterBreakWhenFalse = new Bits(uninitsWhenFalse); |
|
2516 |
PendingExit exit = new PendingExit(tree) { |
|
2517 |
@Override |
|
2518 |
void resolveJump() { |
|
2519 |
if (!inits.isReset()) { |
|
2520 |
split(true); |
|
2521 |
} |
|
2522 |
initsWhenTrue.andSet(initsAfterBreakWhenTrue); |
|
2523 |
initsWhenFalse.andSet(initsAfterBreakWhenFalse); |
|
2524 |
uninitsWhenTrue.andSet(uninitsAfterBreakWhenTrue); |
|
2525 |
uninitsWhenFalse.andSet(uninitsAfterBreakWhenFalse); |
|
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2526 |
} |
55306 | 2527 |
}; |
2528 |
merge(); |
|
2529 |
recordExit(exit); |
|
2530 |
return ; |
|
2531 |
} else { |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2532 |
scan(tree.value); |
55306 | 2533 |
recordExit(new AssignPendingExit(tree, inits, uninits)); |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2534 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2535 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2536 |
|
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2537 |
@Override |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2538 |
public void visitContinue(JCContinue tree) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2539 |
recordExit(new AssignPendingExit(tree, inits, uninits)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2540 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2541 |
|
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2542 |
@Override |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2543 |
public void visitReturn(JCReturn tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2544 |
scanExpr(tree.expr); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2545 |
recordExit(new AssignPendingExit(tree, inits, uninits)); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2546 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2547 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2548 |
public void visitThrow(JCThrow tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2549 |
scanExpr(tree.expr); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2550 |
markDead(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2551 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2552 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2553 |
public void visitApply(JCMethodInvocation tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2554 |
scanExpr(tree.meth); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2555 |
scanExprs(tree.args); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2556 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2557 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2558 |
public void visitNewClass(JCNewClass tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2559 |
scanExpr(tree.encl); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2560 |
scanExprs(tree.args); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2561 |
scan(tree.def); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2562 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2563 |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2564 |
@Override |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2565 |
public void visitLambda(JCLambda tree) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2566 |
final Bits prevUninits = new Bits(uninits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2567 |
final Bits prevInits = new Bits(inits); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2568 |
int returnadrPrev = returnadr; |
31003
c4c8cbd9b3b4
8077667: 'variable may not have been initialized' error for parameter in lambda function
sadayapalam
parents:
29054
diff
changeset
|
2569 |
int nextadrPrev = nextadr; |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2570 |
ListBuffer<PendingExit> prevPending = pendingExits; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2571 |
try { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2572 |
returnadr = nextadr; |
22163 | 2573 |
pendingExits = new ListBuffer<>(); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2574 |
for (List<JCVariableDecl> l = tree.params; l.nonEmpty(); l = l.tail) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2575 |
JCVariableDecl def = l.head; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2576 |
scan(def); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2577 |
inits.incl(def.sym.adr); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2578 |
uninits.excl(def.sym.adr); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2579 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2580 |
if (tree.getBodyKind() == JCLambda.BodyKind.EXPRESSION) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2581 |
scanExpr(tree.body); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2582 |
} else { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2583 |
scan(tree.body); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2584 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2585 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2586 |
finally { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2587 |
returnadr = returnadrPrev; |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2588 |
uninits.assign(prevUninits); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2589 |
inits.assign(prevInits); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2590 |
pendingExits = prevPending; |
31003
c4c8cbd9b3b4
8077667: 'variable may not have been initialized' error for parameter in lambda function
sadayapalam
parents:
29054
diff
changeset
|
2591 |
nextadr = nextadrPrev; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2592 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2593 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14049
diff
changeset
|
2594 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2595 |
public void visitNewArray(JCNewArray tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2596 |
scanExprs(tree.dims); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2597 |
scanExprs(tree.elems); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2598 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2599 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2600 |
public void visitAssert(JCAssert tree) { |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2601 |
final Bits initsExit = new Bits(inits); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2602 |
final Bits uninitsExit = new Bits(uninits); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2603 |
scanCond(tree.cond); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2604 |
uninitsExit.andSet(uninitsWhenTrue); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2605 |
if (tree.detail != null) { |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2606 |
inits.assign(initsWhenFalse); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2607 |
uninits.assign(uninitsWhenFalse); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2608 |
scanExpr(tree.detail); |
10 | 2609 |
} |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2610 |
inits.assign(initsExit); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2611 |
uninits.assign(uninitsExit); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2612 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2613 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2614 |
public void visitAssign(JCAssign tree) { |
50468
4a5fd709e286
8204610: Compiler confused by parenthesized "this" in final fields assignments
mcimadamore
parents:
48721
diff
changeset
|
2615 |
if (!TreeInfo.isIdentOrThisDotIdent(tree.lhs)) |
4a5fd709e286
8204610: Compiler confused by parenthesized "this" in final fields assignments
mcimadamore
parents:
48721
diff
changeset
|
2616 |
scanExpr(tree.lhs); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2617 |
scanExpr(tree.rhs); |
50468
4a5fd709e286
8204610: Compiler confused by parenthesized "this" in final fields assignments
mcimadamore
parents:
48721
diff
changeset
|
2618 |
letInit(tree.lhs); |
24218
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2619 |
} |
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2620 |
|
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2621 |
// check fields accessed through this.<field> are definitely |
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2622 |
// assigned before reading their value |
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2623 |
public void visitSelect(JCFieldAccess tree) { |
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2624 |
super.visitSelect(tree); |
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50468
diff
changeset
|
2625 |
if (TreeInfo.isThisQualifier(tree.selected) && |
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50468
diff
changeset
|
2626 |
tree.sym.kind == VAR) { |
24218
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2627 |
checkInit(tree.pos(), (VarSymbol)tree.sym); |
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2628 |
} |
9102c46a15dc
8039026: Definitely unassigned field can be accessed
pgovereau
parents:
24069
diff
changeset
|
2629 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2630 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2631 |
public void visitAssignop(JCAssignOp tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2632 |
scanExpr(tree.lhs); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2633 |
scanExpr(tree.rhs); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2634 |
letInit(tree.lhs); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2635 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2636 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2637 |
public void visitUnary(JCUnary tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2638 |
switch (tree.getTag()) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2639 |
case NOT: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2640 |
scanCond(tree.arg); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2641 |
final Bits t = new Bits(initsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2642 |
initsWhenFalse.assign(initsWhenTrue); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2643 |
initsWhenTrue.assign(t); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2644 |
t.assign(uninitsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2645 |
uninitsWhenFalse.assign(uninitsWhenTrue); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2646 |
uninitsWhenTrue.assign(t); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2647 |
break; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2648 |
case PREINC: case POSTINC: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2649 |
case PREDEC: case POSTDEC: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2650 |
scanExpr(tree.arg); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2651 |
letInit(tree.arg); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2652 |
break; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2653 |
default: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2654 |
scanExpr(tree.arg); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2655 |
} |
10 | 2656 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2657 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2658 |
public void visitBinary(JCBinary tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2659 |
switch (tree.getTag()) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2660 |
case AND: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2661 |
scanCond(tree.lhs); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2662 |
final Bits initsWhenFalseLeft = new Bits(initsWhenFalse); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2663 |
final Bits uninitsWhenFalseLeft = new Bits(uninitsWhenFalse); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2664 |
inits.assign(initsWhenTrue); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2665 |
uninits.assign(uninitsWhenTrue); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2666 |
scanCond(tree.rhs); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2667 |
initsWhenFalse.andSet(initsWhenFalseLeft); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2668 |
uninitsWhenFalse.andSet(uninitsWhenFalseLeft); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2669 |
break; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2670 |
case OR: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2671 |
scanCond(tree.lhs); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2672 |
final Bits initsWhenTrueLeft = new Bits(initsWhenTrue); |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2673 |
final Bits uninitsWhenTrueLeft = new Bits(uninitsWhenTrue); |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2674 |
inits.assign(initsWhenFalse); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2675 |
uninits.assign(uninitsWhenFalse); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2676 |
scanCond(tree.rhs); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2677 |
initsWhenTrue.andSet(initsWhenTrueLeft); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2678 |
uninitsWhenTrue.andSet(uninitsWhenTrueLeft); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2679 |
break; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2680 |
default: |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2681 |
scanExpr(tree.lhs); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2682 |
scanExpr(tree.rhs); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2683 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2684 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2685 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2686 |
public void visitIdent(JCIdent tree) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2687 |
if (tree.sym.kind == VAR) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2688 |
checkInit(tree.pos(), (VarSymbol)tree.sym); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2689 |
referenced(tree.sym); |
10 | 2690 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2691 |
} |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2692 |
|
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2693 |
void referenced(Symbol sym) { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2694 |
unrefdResources.remove(sym); |
10 | 2695 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2696 |
|
15385 | 2697 |
public void visitAnnotatedType(JCAnnotatedType tree) { |
2698 |
// annotations don't get scanned |
|
2699 |
tree.underlyingType.accept(this); |
|
2700 |
} |
|
2701 |
||
36526 | 2702 |
public void visitModuleDef(JCModuleDecl tree) { |
2703 |
// Do nothing for modules |
|
2704 |
} |
|
2705 |
||
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2706 |
/************************************************************************** |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2707 |
* main method |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2708 |
*************************************************************************/ |
10 | 2709 |
|
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2710 |
/** Perform definite assignment/unassignment analysis on a tree. |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2711 |
*/ |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2712 |
public void analyzeTree(Env<?> env, TreeMaker make) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2713 |
analyzeTree(env, env.tree, make); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2714 |
} |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2715 |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2716 |
public void analyzeTree(Env<?> env, JCTree tree, TreeMaker make) { |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2717 |
try { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2718 |
startPos = tree.pos().getStartPosition(); |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2719 |
|
19122
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
2720 |
if (vardecls == null) |
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
2721 |
vardecls = new JCVariableDecl[32]; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2722 |
else |
19122
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
2723 |
for (int i=0; i<vardecls.length; i++) |
1841f2fa76de
8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents:
18912
diff
changeset
|
2724 |
vardecls[i] = null; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2725 |
firstadr = 0; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2726 |
nextadr = 0; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2727 |
Flow.this.make = make; |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2728 |
pendingExits = new ListBuffer<>(); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2729 |
this.classDef = null; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
24610
diff
changeset
|
2730 |
unrefdResources = WriteableScope.create(env.enclClass.sym); |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2731 |
scan(tree); |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2732 |
} finally { |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2733 |
// note that recursive invocations of this method fail hard |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2734 |
startPos = -1; |
17282
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2735 |
resetBits(inits, uninits, uninitsTry, initsWhenTrue, |
c6964ad7df63
8008562: javac, a refactoring to Bits is necessary in order to provide a change history
vromero
parents:
16971
diff
changeset
|
2736 |
initsWhenFalse, uninitsWhenTrue, uninitsWhenFalse); |
19941
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2737 |
if (vardecls != null) { |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2738 |
for (int i=0; i<vardecls.length; i++) |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2739 |
vardecls[i] = null; |
8b91e8eb2d20
7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents:
19933
diff
changeset
|
2740 |
} |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2741 |
firstadr = 0; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2742 |
nextadr = 0; |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2743 |
Flow.this.make = null; |
12333
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2744 |
pendingExits = null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2745 |
this.classDef = null; |
7b02d0529a97
7151580: Separate DA/DU logic from exception checking logic in Flow.java
mcimadamore
parents:
10950
diff
changeset
|
2746 |
unrefdResources = null; |
8849
4189ac38ddc9
6558548: The compiler needs to be aligned with clarified specification of throws
mcimadamore
parents:
8627
diff
changeset
|
2747 |
} |
4189ac38ddc9
6558548: The compiler needs to be aligned with clarified specification of throws
mcimadamore
parents:
8627
diff
changeset
|
2748 |
} |
4189ac38ddc9
6558548: The compiler needs to be aligned with clarified specification of throws
mcimadamore
parents:
8627
diff
changeset
|
2749 |
} |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2750 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2751 |
/** |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2752 |
* This pass implements the last step of the dataflow analysis, namely |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2753 |
* the effectively-final analysis check. This checks that every local variable |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2754 |
* reference from a lambda body/local inner class is either final or effectively final. |
27844
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2755 |
* Additional this also checks that every variable that is used as an operand to |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2756 |
* try-with-resources is final or effectively final. |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2757 |
* As effectively final variables are marked as such during DA/DU, this pass must run after |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2758 |
* AssignAnalyzer. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2759 |
*/ |
52794
e4ba5414c8b4
8214031: Assertion error in value break statement with conditional operator in switch expression
jlahoda
parents:
52635
diff
changeset
|
2760 |
class CaptureAnalyzer extends BaseAnalyzer { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2761 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2762 |
JCTree currentTree; //local class or lambda |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2763 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2764 |
@Override |
29054
310b8028d7df
8068489: remove unnecessary complexity in Flow and Bits, after JDK-8064857
vromero
parents:
27844
diff
changeset
|
2765 |
void markDead() { |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2766 |
//do nothing |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2767 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2768 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2769 |
@SuppressWarnings("fallthrough") |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2770 |
void checkEffectivelyFinal(DiagnosticPosition pos, VarSymbol sym) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2771 |
if (currentTree != null && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2772 |
sym.owner.kind == MTH && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2773 |
sym.pos < currentTree.getStartPosition()) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2774 |
switch (currentTree.getTag()) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2775 |
case CLASSDEF: |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2776 |
if (!allowEffectivelyFinalInInnerClasses) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2777 |
if ((sym.flags() & FINAL) == 0) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2778 |
reportInnerClsNeedsFinalError(pos, sym); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2779 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2780 |
break; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2781 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2782 |
case LAMBDA: |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2783 |
if ((sym.flags() & (EFFECTIVELY_FINAL | FINAL)) == 0) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2784 |
reportEffectivelyFinalError(pos, sym); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2785 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2786 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2787 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2788 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2789 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2790 |
@SuppressWarnings("fallthrough") |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2791 |
void letInit(JCTree tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2792 |
tree = TreeInfo.skipParens(tree); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2793 |
if (tree.hasTag(IDENT) || tree.hasTag(SELECT)) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2794 |
Symbol sym = TreeInfo.symbol(tree); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2795 |
if (currentTree != null && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2796 |
sym.kind == VAR && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2797 |
sym.owner.kind == MTH && |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2798 |
((VarSymbol)sym).pos < currentTree.getStartPosition()) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2799 |
switch (currentTree.getTag()) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2800 |
case CLASSDEF: |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2801 |
if (!allowEffectivelyFinalInInnerClasses) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2802 |
reportInnerClsNeedsFinalError(tree, sym); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2803 |
break; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2804 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2805 |
case LAMBDA: |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2806 |
reportEffectivelyFinalError(tree, sym); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2807 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2808 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2809 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2810 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2811 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2812 |
void reportEffectivelyFinalError(DiagnosticPosition pos, Symbol sym) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2813 |
String subKey = currentTree.hasTag(LAMBDA) ? |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2814 |
"lambda" : "inner.cls"; |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
2815 |
log.error(pos, Errors.CantRefNonEffectivelyFinalVar(sym, diags.fragment(subKey))); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2816 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2817 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2818 |
void reportInnerClsNeedsFinalError(DiagnosticPosition pos, Symbol sym) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2819 |
log.error(pos, |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
2820 |
Errors.LocalVarAccessedFromIclsNeedsFinal(sym)); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2821 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2822 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2823 |
/************************************************************************* |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2824 |
* Visitor methods for statements and definitions |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2825 |
*************************************************************************/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2826 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2827 |
/* ------------ Visitor methods for various sorts of trees -------------*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2828 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2829 |
public void visitClassDef(JCClassDecl tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2830 |
JCTree prevTree = currentTree; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2831 |
try { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2832 |
currentTree = tree.sym.isLocal() ? tree : null; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2833 |
super.visitClassDef(tree); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2834 |
} finally { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2835 |
currentTree = prevTree; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2836 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2837 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2838 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2839 |
@Override |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2840 |
public void visitLambda(JCLambda tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2841 |
JCTree prevTree = currentTree; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2842 |
try { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2843 |
currentTree = tree; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2844 |
super.visitLambda(tree); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2845 |
} finally { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2846 |
currentTree = prevTree; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2847 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2848 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2849 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2850 |
@Override |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2851 |
public void visitIdent(JCIdent tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2852 |
if (tree.sym.kind == VAR) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2853 |
checkEffectivelyFinal(tree, (VarSymbol)tree.sym); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2854 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2855 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2856 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2857 |
public void visitAssign(JCAssign tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2858 |
JCTree lhs = TreeInfo.skipParens(tree.lhs); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2859 |
if (!(lhs instanceof JCIdent)) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2860 |
scan(lhs); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2861 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2862 |
scan(tree.rhs); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2863 |
letInit(lhs); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2864 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2865 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2866 |
public void visitAssignop(JCAssignOp tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2867 |
scan(tree.lhs); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2868 |
scan(tree.rhs); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2869 |
letInit(tree.lhs); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2870 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2871 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2872 |
public void visitUnary(JCUnary tree) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2873 |
switch (tree.getTag()) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2874 |
case PREINC: case POSTINC: |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2875 |
case PREDEC: case POSTDEC: |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2876 |
scan(tree.arg); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2877 |
letInit(tree.arg); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2878 |
break; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2879 |
default: |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2880 |
scan(tree.arg); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2881 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2882 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2883 |
|
27844
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2884 |
public void visitTry(JCTry tree) { |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2885 |
for (JCTree resource : tree.resources) { |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2886 |
if (!resource.hasTag(VARDEF)) { |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2887 |
Symbol var = TreeInfo.symbol(resource); |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2888 |
if (var != null && (var.flags() & (FINAL | EFFECTIVELY_FINAL)) == 0) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
42828
diff
changeset
|
2889 |
log.error(resource.pos(), Errors.TryWithResourcesExprEffectivelyFinalVar(var)); |
27844
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2890 |
} |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2891 |
} |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2892 |
} |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2893 |
super.visitTry(tree); |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2894 |
} |
8b5d79870a2f
7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents:
27841
diff
changeset
|
2895 |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2896 |
@Override |
55306 | 2897 |
public void visitYield(JCYield tree) { |
2898 |
scan(tree.value); |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2899 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
51047
diff
changeset
|
2900 |
|
36526 | 2901 |
public void visitModuleDef(JCModuleDecl tree) { |
2902 |
// Do nothing for modules |
|
2903 |
} |
|
2904 |
||
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2905 |
/************************************************************************** |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2906 |
* main method |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2907 |
*************************************************************************/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2908 |
|
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2909 |
/** Perform definite assignment/unassignment analysis on a tree. |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2910 |
*/ |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2911 |
public void analyzeTree(Env<AttrContext> env, TreeMaker make) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2912 |
analyzeTree(env, env.tree, make); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2913 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2914 |
public void analyzeTree(Env<AttrContext> env, JCTree tree, TreeMaker make) { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2915 |
try { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2916 |
attrEnv = env; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2917 |
Flow.this.make = make; |
22163 | 2918 |
pendingExits = new ListBuffer<>(); |
13439
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2919 |
scan(tree); |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2920 |
} finally { |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2921 |
pendingExits = null; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2922 |
Flow.this.make = null; |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2923 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2924 |
} |
3025d6ac1401
7175538: Integrate efectively final check with DA/DU analysis
mcimadamore
parents:
13273
diff
changeset
|
2925 |
} |
52635
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2926 |
|
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2927 |
enum Liveness { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2928 |
ALIVE { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2929 |
@Override |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2930 |
public Liveness or(Liveness other) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2931 |
return this; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2932 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2933 |
@Override |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2934 |
public Liveness and(Liveness other) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2935 |
return other; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2936 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2937 |
}, |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2938 |
DEAD { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2939 |
@Override |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2940 |
public Liveness or(Liveness other) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2941 |
return other; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2942 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2943 |
@Override |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2944 |
public Liveness and(Liveness other) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2945 |
return this; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2946 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2947 |
}, |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2948 |
RECOVERY { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2949 |
@Override |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2950 |
public Liveness or(Liveness other) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2951 |
if (other == ALIVE) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2952 |
return ALIVE; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2953 |
} else { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2954 |
return this; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2955 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2956 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2957 |
@Override |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2958 |
public Liveness and(Liveness other) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2959 |
if (other == DEAD) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2960 |
return DEAD; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2961 |
} else { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2962 |
return this; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2963 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2964 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2965 |
}; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2966 |
|
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2967 |
public abstract Liveness or(Liveness other); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2968 |
public abstract Liveness and(Liveness other); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2969 |
public Liveness or(boolean value) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2970 |
return or(from(value)); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2971 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2972 |
public Liveness and(boolean value) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2973 |
return and(from(value)); |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2974 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2975 |
public static Liveness from(boolean value) { |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2976 |
return value ? ALIVE : DEAD; |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2977 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2978 |
} |
6938c8ef179a
8212982: Rule cases in switch expression accepted even if complete normally
jlahoda
parents:
51563
diff
changeset
|
2979 |
|
10 | 2980 |
} |