author | mcimadamore |
Thu, 05 Oct 2017 12:19:23 +0100 | |
changeset 47315 | 31f541df4187 |
parent 47268 | 48ec75306997 |
child 47465 | bc25e62f4794 |
permissions | -rw-r--r-- |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
1 |
/* |
44393
ce94820fa9d1
8176714: javac is wrongly assuming that field JCMemberReference.overloadKind has been assigned to
vromero
parents:
34474
diff
changeset
|
2 |
* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
4 |
* |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
10 |
* |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
15 |
* accompanied this code). |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
16 |
* |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
20 |
* |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
23 |
* questions. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
24 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
25 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
26 |
package com.sun.tools.javac.comp; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
27 |
|
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
28 |
import java.util.ArrayList; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
29 |
|
28146
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
30 |
import com.sun.source.tree.LambdaExpressionTree; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
31 |
import com.sun.tools.javac.code.Source; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
32 |
import com.sun.tools.javac.code.Type; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
33 |
import com.sun.tools.javac.code.Types; |
32911
6ee3c12d2d18
8137269: Add better support for local caching in ArgumentAttr
mcimadamore
parents:
30404
diff
changeset
|
34 |
import com.sun.tools.javac.comp.ArgumentAttr.LocalCacheContext; |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44393
diff
changeset
|
35 |
import com.sun.tools.javac.resources.CompilerProperties.Warnings; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
36 |
import com.sun.tools.javac.tree.JCTree; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
37 |
import com.sun.tools.javac.tree.JCTree.JCBlock; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
38 |
import com.sun.tools.javac.tree.JCTree.JCClassDecl; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
39 |
import com.sun.tools.javac.tree.JCTree.JCDoWhileLoop; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
40 |
import com.sun.tools.javac.tree.JCTree.JCEnhancedForLoop; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
41 |
import com.sun.tools.javac.tree.JCTree.JCForLoop; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
42 |
import com.sun.tools.javac.tree.JCTree.JCIf; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
43 |
import com.sun.tools.javac.tree.JCTree.JCLambda; |
28146
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
44 |
import com.sun.tools.javac.tree.JCTree.JCLambda.ParameterKind; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
45 |
import com.sun.tools.javac.tree.JCTree.JCMethodDecl; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
46 |
import com.sun.tools.javac.tree.JCTree.JCMethodInvocation; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
47 |
import com.sun.tools.javac.tree.JCTree.JCNewClass; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
48 |
import com.sun.tools.javac.tree.JCTree.JCStatement; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
49 |
import com.sun.tools.javac.tree.JCTree.JCSwitch; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
50 |
import com.sun.tools.javac.tree.JCTree.JCTypeApply; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
51 |
import com.sun.tools.javac.tree.JCTree.JCVariableDecl; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
52 |
import com.sun.tools.javac.tree.JCTree.JCWhileLoop; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
53 |
import com.sun.tools.javac.tree.JCTree.Tag; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
54 |
import com.sun.tools.javac.tree.TreeCopier; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
55 |
import com.sun.tools.javac.tree.TreeInfo; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
56 |
import com.sun.tools.javac.tree.TreeMaker; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
57 |
import com.sun.tools.javac.tree.TreeScanner; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
58 |
import com.sun.tools.javac.util.Context; |
28146
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
59 |
import com.sun.tools.javac.util.DefinedBy; |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
60 |
import com.sun.tools.javac.util.DefinedBy.Api; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
61 |
import com.sun.tools.javac.util.JCDiagnostic; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
62 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
63 |
import com.sun.tools.javac.util.List; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
64 |
import com.sun.tools.javac.util.ListBuffer; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
65 |
import com.sun.tools.javac.util.Log; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
66 |
import com.sun.tools.javac.util.Names; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
67 |
import com.sun.tools.javac.util.Options; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
68 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
69 |
import java.util.EnumSet; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
70 |
import java.util.HashMap; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
71 |
import java.util.Map; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
72 |
import java.util.function.Predicate; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
73 |
|
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
74 |
import com.sun.source.tree.NewClassTree; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
75 |
import com.sun.tools.javac.code.Flags; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
76 |
import com.sun.tools.javac.code.Kinds.Kind; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
77 |
import com.sun.tools.javac.code.Symbol.ClassSymbol; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
78 |
import com.sun.tools.javac.tree.JCTree.JCTry; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
79 |
import com.sun.tools.javac.tree.JCTree.JCUnary; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
80 |
import com.sun.tools.javac.util.Assert; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
81 |
import com.sun.tools.javac.util.DiagnosticSource; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
82 |
|
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
83 |
import static com.sun.tools.javac.code.Flags.GENERATEDCONSTR; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
84 |
import static com.sun.tools.javac.code.TypeTag.CLASS; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
85 |
import static com.sun.tools.javac.tree.JCTree.Tag.APPLY; |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
86 |
import static com.sun.tools.javac.tree.JCTree.Tag.FOREACHLOOP; |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
87 |
import static com.sun.tools.javac.tree.JCTree.Tag.LABELLED; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
88 |
import static com.sun.tools.javac.tree.JCTree.Tag.METHODDEF; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
89 |
import static com.sun.tools.javac.tree.JCTree.Tag.NEWCLASS; |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
90 |
import static com.sun.tools.javac.tree.JCTree.Tag.NULLCHK; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
91 |
import static com.sun.tools.javac.tree.JCTree.Tag.TYPEAPPLY; |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
92 |
import static com.sun.tools.javac.tree.JCTree.Tag.VARDEF; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
93 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
94 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
95 |
* Helper class for defining custom code analysis, such as finding instance creation expression |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
96 |
* that can benefit from diamond syntax. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
97 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
98 |
public class Analyzer { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
99 |
protected static final Context.Key<Analyzer> analyzerKey = new Context.Key<>(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
100 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
101 |
final Types types; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
102 |
final Log log; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
103 |
final Attr attr; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
104 |
final DeferredAttr deferredAttr; |
32911
6ee3c12d2d18
8137269: Add better support for local caching in ArgumentAttr
mcimadamore
parents:
30404
diff
changeset
|
105 |
final ArgumentAttr argumentAttr; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
106 |
final TreeMaker make; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
107 |
final Names names; |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
28146
diff
changeset
|
108 |
private final boolean allowDiamondWithAnonymousClassCreation; |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
109 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
110 |
final EnumSet<AnalyzerMode> analyzerModes; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
111 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
112 |
public static Analyzer instance(Context context) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
113 |
Analyzer instance = context.get(analyzerKey); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
114 |
if (instance == null) |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
115 |
instance = new Analyzer(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
116 |
return instance; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
117 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
118 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
119 |
protected Analyzer(Context context) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
120 |
context.put(analyzerKey, this); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
121 |
types = Types.instance(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
122 |
log = Log.instance(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
123 |
attr = Attr.instance(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
124 |
deferredAttr = DeferredAttr.instance(context); |
32911
6ee3c12d2d18
8137269: Add better support for local caching in ArgumentAttr
mcimadamore
parents:
30404
diff
changeset
|
125 |
argumentAttr = ArgumentAttr.instance(context); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
126 |
make = TreeMaker.instance(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
127 |
names = Names.instance(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
128 |
Options options = Options.instance(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
129 |
String findOpt = options.get("find"); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
130 |
//parse modes |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
131 |
Source source = Source.instance(context); |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
28146
diff
changeset
|
132 |
allowDiamondWithAnonymousClassCreation = source.allowDiamondWithAnonymousClassCreation(); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
133 |
analyzerModes = AnalyzerMode.getAnalyzerModes(findOpt, source); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
134 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
135 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
136 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
137 |
* This enum defines supported analyzer modes, as well as defining the logic for decoding |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
138 |
* the {@code -XDfind} option. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
139 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
140 |
enum AnalyzerMode { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
141 |
DIAMOND("diamond", Source::allowDiamond), |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
142 |
LAMBDA("lambda", Source::allowLambda), |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
143 |
METHOD("method", Source::allowGraphInference), |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
144 |
LOCAL("local", Source::allowLocalVariableTypeInference); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
145 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
146 |
final String opt; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
147 |
final Predicate<Source> sourceFilter; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
148 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
149 |
AnalyzerMode(String opt, Predicate<Source> sourceFilter) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
150 |
this.opt = opt; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
151 |
this.sourceFilter = sourceFilter; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
152 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
153 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
154 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
155 |
* This method is used to parse the {@code find} option. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
156 |
* Possible modes are separated by colon; a mode can be excluded by |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
157 |
* prepending '-' to its name. Finally, the special mode 'all' can be used to |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
158 |
* add all modes to the resulting enum. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
159 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
160 |
static EnumSet<AnalyzerMode> getAnalyzerModes(String opt, Source source) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
161 |
if (opt == null) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
162 |
return EnumSet.noneOf(AnalyzerMode.class); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
163 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
164 |
List<String> modes = List.from(opt.split(",")); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
165 |
EnumSet<AnalyzerMode> res = EnumSet.noneOf(AnalyzerMode.class); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
166 |
if (modes.contains("all")) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
167 |
res = EnumSet.allOf(AnalyzerMode.class); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
168 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
169 |
for (AnalyzerMode mode : values()) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
170 |
if (modes.contains(mode.opt)) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
171 |
res.add(mode); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
172 |
} else if (modes.contains("-" + mode.opt) || !mode.sourceFilter.test(source)) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
173 |
res.remove(mode); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
174 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
175 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
176 |
return res; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
177 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
178 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
179 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
180 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
181 |
* A statement analyzer is a work-unit that matches certain AST nodes (of given type {@code S}), |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
182 |
* rewrites them to different AST nodes (of type {@code T}) and then generates some meaningful |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
183 |
* messages in case the analysis has been successful. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
184 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
185 |
abstract class StatementAnalyzer<S extends JCTree, T extends JCTree> { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
186 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
187 |
AnalyzerMode mode; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
188 |
JCTree.Tag tag; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
189 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
190 |
StatementAnalyzer(AnalyzerMode mode, Tag tag) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
191 |
this.mode = mode; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
192 |
this.tag = tag; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
193 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
194 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
195 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
196 |
* Is this analyzer allowed to run? |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
197 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
198 |
boolean isEnabled() { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
199 |
return analyzerModes.contains(mode); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
200 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
201 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
202 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
203 |
* Should this analyzer be rewriting the given tree? |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
204 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
205 |
abstract boolean match(S tree); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
206 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
207 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
208 |
* Rewrite a given AST node into a new one |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
209 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
210 |
abstract T map(S oldTree, S newTree); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
211 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
212 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
213 |
* Entry-point for comparing results and generating diagnostics. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
214 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
215 |
abstract void process(S oldTree, T newTree, boolean hasErrors); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
216 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
217 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
218 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
219 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
220 |
* This analyzer checks if generic instance creation expression can use diamond syntax. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
221 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
222 |
class DiamondInitializer extends StatementAnalyzer<JCNewClass, JCNewClass> { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
223 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
224 |
DiamondInitializer() { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
225 |
super(AnalyzerMode.DIAMOND, NEWCLASS); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
226 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
227 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
228 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
229 |
boolean match(JCNewClass tree) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
230 |
return tree.clazz.hasTag(TYPEAPPLY) && |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
231 |
!TreeInfo.isDiamond(tree) && |
29776
984a79b71cfe
8062373: Project Coin: diamond and anonymous classes
sadayapalam
parents:
28146
diff
changeset
|
232 |
(tree.def == null || allowDiamondWithAnonymousClassCreation); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
233 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
234 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
235 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
236 |
JCNewClass map(JCNewClass oldTree, JCNewClass newTree) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
237 |
if (newTree.clazz.hasTag(TYPEAPPLY)) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
238 |
((JCTypeApply)newTree.clazz).arguments = List.nil(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
239 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
240 |
return newTree; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
241 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
242 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
243 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
244 |
void process(JCNewClass oldTree, JCNewClass newTree, boolean hasErrors) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
245 |
if (!hasErrors) { |
30404
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
246 |
List<Type> inferredArgs, explicitArgs; |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
247 |
if (oldTree.def != null) { |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
248 |
inferredArgs = newTree.def.implementing.nonEmpty() |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
249 |
? newTree.def.implementing.get(0).type.getTypeArguments() |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
250 |
: newTree.def.extending.type.getTypeArguments(); |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
251 |
explicitArgs = oldTree.def.implementing.nonEmpty() |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
252 |
? oldTree.def.implementing.get(0).type.getTypeArguments() |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
253 |
: oldTree.def.extending.type.getTypeArguments(); |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
254 |
} else { |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
255 |
inferredArgs = newTree.type.getTypeArguments(); |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
256 |
explicitArgs = oldTree.type.getTypeArguments(); |
952a476681b2
8078473: javac diamond finder crashes when used to build java.base module.
sadayapalam
parents:
29776
diff
changeset
|
257 |
} |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
258 |
for (Type t : inferredArgs) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
259 |
if (!types.isSameType(t, explicitArgs.head)) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
260 |
return; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
261 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
262 |
explicitArgs = explicitArgs.tail; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
263 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
264 |
//exact match |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44393
diff
changeset
|
265 |
log.warning(oldTree.clazz, Warnings.DiamondRedundantArgs); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
266 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
267 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
268 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
269 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
270 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
271 |
* This analyzer checks if anonymous instance creation expression can replaced by lambda. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
272 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
273 |
class LambdaAnalyzer extends StatementAnalyzer<JCNewClass, JCLambda> { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
274 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
275 |
LambdaAnalyzer() { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
276 |
super(AnalyzerMode.LAMBDA, NEWCLASS); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
277 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
278 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
279 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
280 |
boolean match (JCNewClass tree){ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
281 |
Type clazztype = tree.clazz.type; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
282 |
return tree.def != null && |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
283 |
clazztype.hasTag(CLASS) && |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
284 |
types.isFunctionalInterface(clazztype.tsym) && |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
285 |
decls(tree.def).length() == 1; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
286 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
287 |
//where |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
288 |
private List<JCTree> decls(JCClassDecl decl) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
289 |
ListBuffer<JCTree> decls = new ListBuffer<>(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
290 |
for (JCTree t : decl.defs) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
291 |
if (t.hasTag(METHODDEF)) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
292 |
JCMethodDecl md = (JCMethodDecl)t; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
293 |
if ((md.getModifiers().flags & GENERATEDCONSTR) == 0) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
294 |
decls.add(md); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
295 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
296 |
} else { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
297 |
decls.add(t); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
298 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
299 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
300 |
return decls.toList(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
301 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
302 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
303 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
304 |
JCLambda map (JCNewClass oldTree, JCNewClass newTree){ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
305 |
JCMethodDecl md = (JCMethodDecl)decls(newTree.def).head; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
306 |
List<JCVariableDecl> params = md.params; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
307 |
JCBlock body = md.body; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
308 |
return make.Lambda(params, body); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
309 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
310 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
311 |
void process (JCNewClass oldTree, JCLambda newTree, boolean hasErrors){ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
312 |
if (!hasErrors) { |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44393
diff
changeset
|
313 |
log.warning(oldTree.def, Warnings.PotentialLambdaFound); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
314 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
315 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
316 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
317 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
318 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
319 |
* This analyzer checks if generic method call has redundant type arguments. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
320 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
321 |
class RedundantTypeArgAnalyzer extends StatementAnalyzer<JCMethodInvocation, JCMethodInvocation> { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
322 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
323 |
RedundantTypeArgAnalyzer() { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
324 |
super(AnalyzerMode.METHOD, APPLY); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
325 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
326 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
327 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
328 |
boolean match (JCMethodInvocation tree){ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
329 |
return tree.typeargs != null && |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
330 |
tree.typeargs.nonEmpty(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
331 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
332 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
333 |
JCMethodInvocation map (JCMethodInvocation oldTree, JCMethodInvocation newTree){ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
334 |
newTree.typeargs = List.nil(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
335 |
return newTree; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
336 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
337 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
338 |
void process (JCMethodInvocation oldTree, JCMethodInvocation newTree, boolean hasErrors){ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
339 |
if (!hasErrors) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
340 |
//exact match |
45504
ea7475564d07
8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents:
44393
diff
changeset
|
341 |
log.warning(oldTree, Warnings.MethodRedundantTypeargs); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
342 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
343 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
344 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
345 |
|
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
346 |
/** |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
347 |
* Base class for local variable inference analyzers. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
348 |
*/ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
349 |
abstract class RedundantLocalVarTypeAnalyzerBase<X extends JCStatement> extends StatementAnalyzer<X, X> { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
350 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
351 |
RedundantLocalVarTypeAnalyzerBase(JCTree.Tag tag) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
352 |
super(AnalyzerMode.LOCAL, tag); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
353 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
354 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
355 |
/** |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
356 |
* Map a variable tree into a new declaration using implicit type. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
357 |
*/ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
358 |
JCVariableDecl mapVar(JCVariableDecl oldTree, JCVariableDecl newTree){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
359 |
newTree.vartype = null; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
360 |
return newTree; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
361 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
362 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
363 |
/** |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
364 |
* Analyze results of local variable inference. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
365 |
*/ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
366 |
void processVar(JCVariableDecl oldTree, JCVariableDecl newTree, boolean hasErrors){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
367 |
if (!hasErrors) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
368 |
if (types.isSameType(oldTree.type, newTree.type)) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
369 |
log.warning(oldTree, Warnings.LocalRedundantType); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
370 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
371 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
372 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
373 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
374 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
375 |
/** |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
376 |
* This analyzer checks if a local variable declaration has redundant type. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
377 |
*/ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
378 |
class RedundantLocalVarTypeAnalyzer extends RedundantLocalVarTypeAnalyzerBase<JCVariableDecl> { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
379 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
380 |
RedundantLocalVarTypeAnalyzer() { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
381 |
super(VARDEF); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
382 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
383 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
384 |
boolean match(JCVariableDecl tree){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
385 |
return tree.sym.owner.kind == Kind.MTH && |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
386 |
tree.init != null && !tree.isImplicitlyTyped() && |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
387 |
attr.canInferLocalVarType(tree) == null; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
388 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
389 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
390 |
JCVariableDecl map(JCVariableDecl oldTree, JCVariableDecl newTree){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
391 |
return mapVar(oldTree, newTree); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
392 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
393 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
394 |
void process(JCVariableDecl oldTree, JCVariableDecl newTree, boolean hasErrors){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
395 |
processVar(oldTree, newTree, hasErrors); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
396 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
397 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
398 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
399 |
/** |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
400 |
* This analyzer checks if a for each variable declaration has redundant type. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
401 |
*/ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
402 |
class RedundantLocalVarTypeAnalyzerForEach extends RedundantLocalVarTypeAnalyzerBase<JCEnhancedForLoop> { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
403 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
404 |
RedundantLocalVarTypeAnalyzerForEach() { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
405 |
super(FOREACHLOOP); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
406 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
407 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
408 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
409 |
boolean match(JCEnhancedForLoop tree){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
410 |
return !tree.var.isImplicitlyTyped(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
411 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
412 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
413 |
JCEnhancedForLoop map(JCEnhancedForLoop oldTree, JCEnhancedForLoop newTree){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
414 |
newTree.var = mapVar(oldTree.var, newTree.var); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
415 |
newTree.body = make.Block(0, List.nil()); //ignore body for analysis purpose |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
416 |
return newTree; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
417 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
418 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
419 |
void process(JCEnhancedForLoop oldTree, JCEnhancedForLoop newTree, boolean hasErrors){ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
420 |
processVar(oldTree.var, newTree.var, hasErrors); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
421 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
422 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
423 |
|
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
424 |
@SuppressWarnings({"unchecked", "rawtypes"}) |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
425 |
StatementAnalyzer<JCTree, JCTree>[] analyzers = new StatementAnalyzer[] { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
426 |
new DiamondInitializer(), |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
427 |
new LambdaAnalyzer(), |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
428 |
new RedundantTypeArgAnalyzer(), |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
429 |
new RedundantLocalVarTypeAnalyzer(), |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
47216
diff
changeset
|
430 |
new RedundantLocalVarTypeAnalyzerForEach() |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
431 |
}; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
432 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
433 |
/** |
45605
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
434 |
* Create a copy of Env if needed. |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
435 |
*/ |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
436 |
Env<AttrContext> copyEnvIfNeeded(JCTree tree, Env<AttrContext> env) { |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
437 |
if (!analyzerModes.isEmpty() && |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
438 |
!env.info.isSpeculative && |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
439 |
TreeInfo.isStatement(tree) && |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
440 |
!tree.hasTag(LABELLED)) { |
45605
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
441 |
Env<AttrContext> analyzeEnv = |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
442 |
env.dup(env.tree, env.info.dup(env.info.scope.dupUnshared(env.info.scope.owner))); |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
443 |
analyzeEnv.info.returnResult = analyzeEnv.info.returnResult != null ? |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
444 |
attr.new ResultInfo(analyzeEnv.info.returnResult.pkind, |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
445 |
analyzeEnv.info.returnResult.pt) : null; |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
446 |
return analyzeEnv; |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
447 |
} else { |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
448 |
return null; |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
449 |
} |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
450 |
} |
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
451 |
|
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
452 |
/** |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
453 |
* Analyze an AST node if needed. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
454 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
455 |
void analyzeIfNeeded(JCTree tree, Env<AttrContext> env) { |
45605
8d019eee3515
8181911: Lambda Analyzer causes compile-time error
jlahoda
parents:
45504
diff
changeset
|
456 |
if (env != null) { |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
457 |
JCStatement stmt = (JCStatement)tree; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
458 |
analyze(stmt, env); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
459 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
460 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
461 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
462 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
463 |
* Analyze an AST node; this involves collecting a list of all the nodes that needs rewriting, |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
464 |
* and speculatively type-check the rewritten code to compare results against previously attributed code. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
465 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
466 |
void analyze(JCStatement statement, Env<AttrContext> env) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
467 |
AnalysisContext context = new AnalysisContext(statement, env); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
468 |
StatementScanner statementScanner = new StatementScanner(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
469 |
statementScanner.scan(statement); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
470 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
471 |
if (!context.treesToAnalyzer.isEmpty()) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
472 |
deferredAnalysisHelper.queue(context); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
473 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
474 |
} |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
475 |
|
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
476 |
/** |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
477 |
* Helper interface to handle deferral of analysis tasks. |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
478 |
*/ |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
479 |
interface DeferredAnalysisHelper { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
480 |
/** |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
481 |
* Add a new analysis task to the queue. |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
482 |
*/ |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
483 |
void queue(AnalysisContext context); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
484 |
/** |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
485 |
* Flush queue with given attribution env. |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
486 |
*/ |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
487 |
void flush(Env<AttrContext> flushEnv); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
488 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
489 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
490 |
/** |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
491 |
* Dummy deferral handler. |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
492 |
*/ |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
493 |
DeferredAnalysisHelper flushDeferredHelper = new DeferredAnalysisHelper() { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
494 |
@Override |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
495 |
public void queue(AnalysisContext context) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
496 |
//do nothing |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
497 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
498 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
499 |
@Override |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
500 |
public void flush(Env<AttrContext> flushEnv) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
501 |
//do nothing |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
502 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
503 |
}; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
504 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
505 |
/** |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
506 |
* Simple deferral handler. All tasks belonging to the same outermost class are added to |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
507 |
* the same queue. The queue is flushed after flow analysis (only if no error occurred). |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
508 |
*/ |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
509 |
DeferredAnalysisHelper queueDeferredHelper = new DeferredAnalysisHelper() { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
510 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
511 |
Map<ClassSymbol, ArrayList<AnalysisContext>> Q = new HashMap<>(); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
512 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
513 |
@Override |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
514 |
public void queue(AnalysisContext context) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
515 |
ArrayList<AnalysisContext> s = Q.computeIfAbsent(context.env.enclClass.sym.outermostClass(), k -> new ArrayList<>()); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
516 |
s.add(context); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
517 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
518 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
519 |
@Override |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
520 |
public void flush(Env<AttrContext> flushEnv) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
521 |
if (!Q.isEmpty()) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
522 |
DeferredAnalysisHelper prevHelper = deferredAnalysisHelper; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
523 |
try { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
524 |
deferredAnalysisHelper = flushDeferredHelper; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
525 |
ArrayList<AnalysisContext> s = Q.get(flushEnv.enclClass.sym.outermostClass()); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
526 |
while (s != null && !s.isEmpty()) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
527 |
doAnalysis(s.remove(0)); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
528 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
529 |
} finally { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
530 |
deferredAnalysisHelper = prevHelper; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
531 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
532 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
533 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
534 |
}; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
535 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
536 |
DeferredAnalysisHelper deferredAnalysisHelper = queueDeferredHelper; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
537 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
538 |
void doAnalysis(AnalysisContext context) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
539 |
DiagnosticSource prevSource = log.currentSource(); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
540 |
LocalCacheContext localCacheContext = argumentAttr.withLocalCacheContext(); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
541 |
try { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
542 |
log.useSource(context.env.toplevel.getSourceFile()); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
543 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
544 |
JCStatement treeToAnalyze = (JCStatement)context.tree; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
545 |
if (context.env.info.scope.owner.kind == Kind.TYP) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
546 |
//add a block to hoist potential dangling variable declarations |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
547 |
treeToAnalyze = make.Block(Flags.SYNTHETIC, List.of((JCStatement)context.tree)); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
548 |
} |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
549 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
550 |
TreeMapper treeMapper = new TreeMapper(context); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
551 |
//TODO: to further refine the analysis, try all rewriting combinations |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
552 |
deferredAttr.attribSpeculative(treeToAnalyze, context.env, attr.statInfo, treeMapper, |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
553 |
t -> new AnalyzeDeferredDiagHandler(context), argumentAttr.withLocalCacheContext()); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
554 |
context.treeMap.entrySet().forEach(e -> { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
555 |
context.treesToAnalyzer.get(e.getKey()) |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
556 |
.process(e.getKey(), e.getValue(), context.errors.nonEmpty()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
557 |
}); |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
558 |
} catch (Throwable ex) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
559 |
Assert.error("Analyzer error when processing: " + context.tree); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
560 |
} finally { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
561 |
log.useSource(prevSource.getFile()); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
562 |
localCacheContext.leave(); |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
563 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
564 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
565 |
|
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
566 |
public void flush(Env<AttrContext> flushEnv) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
567 |
deferredAnalysisHelper.flush(flushEnv); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
568 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
569 |
|
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
570 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
571 |
* Simple deferred diagnostic handler which filters out all messages and keep track of errors. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
572 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
573 |
class AnalyzeDeferredDiagHandler extends Log.DeferredDiagnosticHandler { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
574 |
AnalysisContext context; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
575 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
576 |
public AnalyzeDeferredDiagHandler(AnalysisContext context) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
577 |
super(log, d -> { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
578 |
if (d.getType() == DiagnosticType.ERROR) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
579 |
context.errors.add(d); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
580 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
581 |
return true; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
582 |
}); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
583 |
this.context = context; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
584 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
585 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
586 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
587 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
588 |
* This class is used to pass around contextual information bewteen analyzer classes, such as |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
589 |
* trees to be rewritten, errors occurred during the speculative attribution step, etc. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
590 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
591 |
class AnalysisContext { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
592 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
593 |
JCTree tree; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
594 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
595 |
Env<AttrContext> env; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
596 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
597 |
AnalysisContext(JCTree tree, Env<AttrContext> env) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
598 |
this.tree = tree; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
599 |
this.env = attr.copyEnv(env); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
600 |
/* this is a temporary workaround that should be removed once we have a truly independent |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
601 |
* clone operation |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
602 |
*/ |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
603 |
if (tree.hasTag(VARDEF)) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
604 |
// avoid redefinition clashes |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
605 |
this.env.info.scope.remove(((JCVariableDecl)tree).sym); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
606 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
607 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
608 |
|
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
609 |
/** Map from trees to analyzers. */ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
610 |
Map<JCTree, StatementAnalyzer<JCTree, JCTree>> treesToAnalyzer = new HashMap<>(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
611 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
612 |
/** Map from original AST nodes to rewritten AST nodes */ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
613 |
Map<JCTree, JCTree> treeMap = new HashMap<>(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
614 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
615 |
/** Errors in rewritten tree */ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
616 |
ListBuffer<JCDiagnostic> errors = new ListBuffer<>(); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
617 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
618 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
619 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
620 |
* Subclass of {@link com.sun.tools.javac.tree.TreeScanner} which visit AST-nodes w/o crossing |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
621 |
* statement boundaries. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
622 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
623 |
class StatementScanner extends TreeScanner { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
624 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
625 |
/** context */ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
626 |
AnalysisContext context; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
627 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
628 |
StatementScanner(AnalysisContext context) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
629 |
this.context = context; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
630 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
631 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
632 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
633 |
@SuppressWarnings("unchecked") |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
634 |
public void scan(JCTree tree) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
635 |
if (tree != null) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
636 |
for (StatementAnalyzer<JCTree, JCTree> analyzer : analyzers) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
637 |
if (analyzer.isEnabled() && |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
638 |
tree.hasTag(analyzer.tag) && |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
639 |
analyzer.match(tree)) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
640 |
context.treesToAnalyzer.put(tree, analyzer); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
641 |
break; //TODO: cover cases where multiple matching analyzers are found |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
642 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
643 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
644 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
645 |
super.scan(tree); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
646 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
647 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
648 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
649 |
public void visitClassDef(JCClassDecl tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
650 |
//do nothing (prevents seeing same stuff twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
651 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
652 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
653 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
654 |
public void visitMethodDef(JCMethodDecl tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
655 |
//do nothing (prevents seeing same stuff twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
656 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
657 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
658 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
659 |
public void visitBlock(JCBlock tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
660 |
//do nothing (prevents seeing same stuff twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
661 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
662 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
663 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
664 |
public void visitSwitch(JCSwitch tree) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
665 |
scan(tree.getExpression()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
666 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
667 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
668 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
669 |
public void visitForLoop(JCForLoop tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
670 |
//skip body and var decl (to prevents same statements to be analyzed twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
671 |
scan(tree.getCondition()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
672 |
scan(tree.getUpdate()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
673 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
674 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
675 |
@Override |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
676 |
public void visitTry(JCTry tree) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
677 |
//skip resources (to prevents same statements to be analyzed twice) |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
678 |
scan(tree.getBlock()); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
679 |
scan(tree.getCatches()); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
680 |
scan(tree.getFinallyBlock()); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
681 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
682 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
683 |
@Override |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
684 |
public void visitForeachLoop(JCEnhancedForLoop tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
685 |
//skip body (to prevents same statements to be analyzed twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
686 |
scan(tree.getExpression()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
687 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
688 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
689 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
690 |
public void visitWhileLoop(JCWhileLoop tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
691 |
//skip body (to prevents same statements to be analyzed twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
692 |
scan(tree.getCondition()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
693 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
694 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
695 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
696 |
public void visitDoLoop(JCDoWhileLoop tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
697 |
//skip body (to prevents same statements to be analyzed twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
698 |
scan(tree.getCondition()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
699 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
700 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
701 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
702 |
public void visitIf(JCIf tree) { |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
703 |
//skip body (to prevents same statements to be analyzed twice) |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
704 |
scan(tree.getCondition()); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
705 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
706 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
707 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
708 |
/** |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
709 |
* Subclass of TreeCopier that maps nodes matched by analyzers onto new AST nodes. |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
710 |
*/ |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
711 |
class TreeMapper extends TreeCopier<Void> { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
712 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
713 |
AnalysisContext context; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
714 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
715 |
TreeMapper(AnalysisContext context) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
716 |
super(make); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
717 |
this.context = context; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
718 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
719 |
|
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
720 |
@Override |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
721 |
@SuppressWarnings("unchecked") |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
722 |
public <Z extends JCTree> Z copy(Z tree, Void _unused) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
723 |
Z newTree = super.copy(tree, _unused); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
724 |
StatementAnalyzer<JCTree, JCTree> analyzer = context.treesToAnalyzer.get(tree); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
725 |
if (analyzer != null) { |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
726 |
newTree = (Z)analyzer.map(tree, newTree); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
727 |
context.treeMap.put(tree, newTree); |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
728 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
729 |
return newTree; |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
730 |
} |
28146
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
731 |
|
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
732 |
@Override @DefinedBy(Api.COMPILER_TREE) |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
733 |
public JCTree visitLambdaExpression(LambdaExpressionTree node, Void _unused) { |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
734 |
JCLambda oldLambda = (JCLambda)node; |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
735 |
JCLambda newLambda = (JCLambda)super.visitLambdaExpression(node, _unused); |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
736 |
if (oldLambda.paramKind == ParameterKind.IMPLICIT) { |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
737 |
//reset implicit lambda parameters (whose type might have been set during attr) |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
738 |
newLambda.paramKind = ParameterKind.IMPLICIT; |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
739 |
newLambda.params.forEach(p -> p.vartype = null); |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
740 |
} |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
741 |
return newLambda; |
adf3a039cb7d
8067792: Javac crashes in finder mode with nested implicit lambdas
mcimadamore
parents:
28142
diff
changeset
|
742 |
} |
45862
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
743 |
|
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
744 |
@Override @DefinedBy(Api.COMPILER_TREE) |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
745 |
public JCTree visitNewClass(NewClassTree node, Void aVoid) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
746 |
JCNewClass oldNewClazz = (JCNewClass)node; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
747 |
JCNewClass newNewClazz = (JCNewClass)super.visitNewClass(node, aVoid); |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
748 |
if (!oldNewClazz.args.isEmpty() && oldNewClazz.args.head.hasTag(NULLCHK)) { |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
749 |
//workaround to Attr generating trees |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
750 |
newNewClazz.encl = ((JCUnary)newNewClazz.args.head).arg; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
751 |
newNewClazz.args = newNewClazz.args.tail; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
752 |
} |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
753 |
return newNewClazz; |
c6827bac317d
8183126: port improvements to analyzers from lvti repo to jdk10
vromero
parents:
45605
diff
changeset
|
754 |
} |
28142
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
755 |
} |
32a6b1af81b1
8064365: Better support for finder capabilities in target-typing context
mcimadamore
parents:
diff
changeset
|
756 |
} |