author | jlahoda |
Wed, 09 Jul 2014 16:32:05 +0200 | |
changeset 25443 | 9187d77f2c64 |
parent 25275 | e5e9bf4b8c49 |
child 25444 | 27045478cf23 |
permissions | -rw-r--r-- |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
1 |
/* |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
2 |
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
4 |
* |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
10 |
* |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
15 |
* accompanied this code). |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
16 |
* |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
20 |
* |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
23 |
* questions. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
24 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
25 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
26 |
package com.sun.tools.javac.comp; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
27 |
|
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
28 |
import com.sun.source.tree.*; |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
29 |
import com.sun.source.tree.LambdaExpressionTree.BodyKind; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
30 |
import com.sun.tools.javac.code.*; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
31 |
import com.sun.tools.javac.tree.*; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
32 |
import com.sun.tools.javac.util.*; |
16805
b419336382fd
8010922: Cleanup: add support for ad-hoc method check logic
mcimadamore
parents:
16566
diff
changeset
|
33 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
34 |
import com.sun.tools.javac.code.Symbol.*; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
35 |
import com.sun.tools.javac.code.Type.*; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
36 |
import com.sun.tools.javac.comp.Attr.ResultInfo; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
37 |
import com.sun.tools.javac.comp.Infer.InferenceContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
38 |
import com.sun.tools.javac.comp.Resolve.MethodResolutionPhase; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
39 |
import com.sun.tools.javac.tree.JCTree.*; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
40 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
41 |
import java.util.ArrayList; |
19914 | 42 |
import java.util.Collections; |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
43 |
import java.util.EnumSet; |
19914 | 44 |
import java.util.LinkedHashMap; |
14547 | 45 |
import java.util.LinkedHashSet; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
46 |
import java.util.Map; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
47 |
import java.util.Set; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
48 |
import java.util.WeakHashMap; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
49 |
|
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
50 |
import static com.sun.tools.javac.code.Kinds.VAL; |
14547 | 51 |
import static com.sun.tools.javac.code.TypeTag.*; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
52 |
import static com.sun.tools.javac.tree.JCTree.Tag.*; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
53 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
54 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
55 |
* This is an helper class that is used to perform deferred type-analysis. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
56 |
* Each time a poly expression occurs in argument position, javac attributes it |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
57 |
* with a temporary 'deferred type' that is checked (possibly multiple times) |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
58 |
* against an expected formal type. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
59 |
* |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
60 |
* <p><b>This is NOT part of any supported API. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
61 |
* If you write code that depends on this, you do so at your own risk. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
62 |
* This code and its internal interfaces are subject to change or |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
63 |
* deletion without notice.</b> |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
64 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
65 |
public class DeferredAttr extends JCTree.Visitor { |
22163 | 66 |
protected static final Context.Key<DeferredAttr> deferredAttrKey = new Context.Key<>(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
67 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
68 |
final Attr attr; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
69 |
final Check chk; |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
70 |
final JCDiagnostic.Factory diags; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
71 |
final Enter enter; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
72 |
final Infer infer; |
16294
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
73 |
final Resolve rs; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
74 |
final Log log; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
75 |
final Symtab syms; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
76 |
final TreeMaker make; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
77 |
final Types types; |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
78 |
final Flow flow; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
79 |
final Names names; |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
80 |
final Annotate annotate; |
25007 | 81 |
final TypeEnvs typeEnvs; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
82 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
83 |
public static DeferredAttr instance(Context context) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
84 |
DeferredAttr instance = context.get(deferredAttrKey); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
85 |
if (instance == null) |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
86 |
instance = new DeferredAttr(context); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
87 |
return instance; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
88 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
89 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
90 |
protected DeferredAttr(Context context) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
91 |
context.put(deferredAttrKey, this); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
92 |
attr = Attr.instance(context); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
93 |
chk = Check.instance(context); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
94 |
diags = JCDiagnostic.Factory.instance(context); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
95 |
enter = Enter.instance(context); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
96 |
infer = Infer.instance(context); |
16294
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
97 |
rs = Resolve.instance(context); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
98 |
log = Log.instance(context); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
99 |
syms = Symtab.instance(context); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
100 |
make = TreeMaker.instance(context); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
101 |
types = Types.instance(context); |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
102 |
flow = Flow.instance(context); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
103 |
names = Names.instance(context); |
18902 | 104 |
stuckTree = make.Ident(names.empty).setType(Type.stuckType); |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
105 |
annotate = Annotate.instance(context); |
25007 | 106 |
typeEnvs = TypeEnvs.instance(context); |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
107 |
emptyDeferredAttrContext = |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
108 |
new DeferredAttrContext(AttrMode.CHECK, null, MethodResolutionPhase.BOX, infer.emptyContext, null, null) { |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
109 |
@Override |
19914 | 110 |
void addDeferredAttrNode(DeferredType dt, ResultInfo ri, DeferredStuckPolicy deferredStuckPolicy) { |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
111 |
Assert.error("Empty deferred context!"); |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
112 |
} |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
113 |
@Override |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
114 |
void complete() { |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
115 |
Assert.error("Empty deferred context!"); |
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
116 |
} |
24226
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24066
diff
changeset
|
117 |
|
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24066
diff
changeset
|
118 |
@Override |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24066
diff
changeset
|
119 |
public String toString() { |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24066
diff
changeset
|
120 |
return "Empty deferred context!"; |
08b586e22328
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
vromero
parents:
24066
diff
changeset
|
121 |
} |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
122 |
}; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
123 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
124 |
|
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
125 |
/** shared tree for stuck expressions */ |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
126 |
final JCTree stuckTree; |
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
127 |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
128 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
129 |
* This type represents a deferred type. A deferred type starts off with |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
130 |
* no information on the underlying expression type. Such info needs to be |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
131 |
* discovered through type-checking the deferred type against a target-type. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
132 |
* Every deferred type keeps a pointer to the AST node from which it originated. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
133 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
134 |
public class DeferredType extends Type { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
135 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
136 |
public JCExpression tree; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
137 |
Env<AttrContext> env; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
138 |
AttrMode mode; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
139 |
SpeculativeCache speculativeCache; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
140 |
|
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
141 |
DeferredType(JCExpression tree, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
142 |
Env<AttrContext> env) { |
24396 | 143 |
super(null, noAnnotations); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
144 |
this.tree = tree; |
18912
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18910
diff
changeset
|
145 |
this.env = attr.copyEnv(env); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
146 |
this.speculativeCache = new SpeculativeCache(); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
147 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
148 |
|
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18643
diff
changeset
|
149 |
@Override |
24396 | 150 |
public DeferredType annotatedType(List<Attribute.TypeCompound> typeAnnotations) { |
151 |
throw new AssertionError("Cannot annotate a deferred type"); |
|
152 |
} |
|
153 |
||
154 |
@Override |
|
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18643
diff
changeset
|
155 |
public TypeTag getTag() { |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18643
diff
changeset
|
156 |
return DEFERRED; |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18643
diff
changeset
|
157 |
} |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18643
diff
changeset
|
158 |
|
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
159 |
@Override |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
160 |
public String toString() { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
161 |
return "DeferredType"; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
162 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
163 |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
164 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
165 |
* A speculative cache is used to keep track of all overload resolution rounds |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
166 |
* that triggered speculative attribution on a given deferred type. Each entry |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
167 |
* stores a pointer to the speculative tree and the resolution phase in which the entry |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
168 |
* has been added. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
169 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
170 |
class SpeculativeCache { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
171 |
|
22163 | 172 |
private Map<Symbol, List<Entry>> cache = new WeakHashMap<>(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
173 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
174 |
class Entry { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
175 |
JCTree speculativeTree; |
19914 | 176 |
ResultInfo resultInfo; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
177 |
|
19914 | 178 |
public Entry(JCTree speculativeTree, ResultInfo resultInfo) { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
179 |
this.speculativeTree = speculativeTree; |
19914 | 180 |
this.resultInfo = resultInfo; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
181 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
182 |
|
19914 | 183 |
boolean matches(MethodResolutionPhase phase) { |
184 |
return resultInfo.checkContext.deferredAttrContext().phase == phase; |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
185 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
186 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
187 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
188 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
189 |
* Retrieve a speculative cache entry corresponding to given symbol |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
190 |
* and resolution phase |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
191 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
192 |
Entry get(Symbol msym, MethodResolutionPhase phase) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
193 |
List<Entry> entries = cache.get(msym); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
194 |
if (entries == null) return null; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
195 |
for (Entry e : entries) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
196 |
if (e.matches(phase)) return e; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
197 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
198 |
return null; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
199 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
200 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
201 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
202 |
* Stores a speculative cache entry corresponding to given symbol |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
203 |
* and resolution phase |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
204 |
*/ |
19914 | 205 |
void put(JCTree speculativeTree, ResultInfo resultInfo) { |
206 |
Symbol msym = resultInfo.checkContext.deferredAttrContext().msym; |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
207 |
List<Entry> entries = cache.get(msym); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
208 |
if (entries == null) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
209 |
entries = List.nil(); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
210 |
} |
19914 | 211 |
cache.put(msym, entries.prepend(new Entry(speculativeTree, resultInfo))); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
212 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
213 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
214 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
215 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
216 |
* Get the type that has been computed during a speculative attribution round |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
217 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
218 |
Type speculativeType(Symbol msym, MethodResolutionPhase phase) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
219 |
SpeculativeCache.Entry e = speculativeCache.get(msym, phase); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
220 |
return e != null ? e.speculativeTree.type : Type.noType; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
221 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
222 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
223 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
224 |
* Check a deferred type against a potential target-type. Depending on |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
225 |
* the current attribution mode, a normal vs. speculative attribution |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
226 |
* round is performed on the underlying AST node. There can be only one |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
227 |
* speculative round for a given target method symbol; moreover, a normal |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
228 |
* attribution round must follow one or more speculative rounds. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
229 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
230 |
Type check(ResultInfo resultInfo) { |
19914 | 231 |
DeferredStuckPolicy deferredStuckPolicy; |
232 |
if (resultInfo.pt.hasTag(NONE) || resultInfo.pt.isErroneous()) { |
|
233 |
deferredStuckPolicy = dummyStuckPolicy; |
|
234 |
} else if (resultInfo.checkContext.deferredAttrContext().mode == AttrMode.SPECULATIVE) { |
|
235 |
deferredStuckPolicy = new OverloadStuckPolicy(resultInfo, this); |
|
236 |
} else { |
|
237 |
deferredStuckPolicy = new CheckStuckPolicy(resultInfo, this); |
|
238 |
} |
|
239 |
return check(resultInfo, deferredStuckPolicy, basicCompleter); |
|
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
240 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
241 |
|
19914 | 242 |
private Type check(ResultInfo resultInfo, DeferredStuckPolicy deferredStuckPolicy, |
243 |
DeferredTypeCompleter deferredTypeCompleter) { |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
244 |
DeferredAttrContext deferredAttrContext = |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
245 |
resultInfo.checkContext.deferredAttrContext(); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
246 |
Assert.check(deferredAttrContext != emptyDeferredAttrContext); |
19914 | 247 |
if (deferredStuckPolicy.isStuck()) { |
248 |
deferredAttrContext.addDeferredAttrNode(this, resultInfo, deferredStuckPolicy); |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
249 |
return Type.noType; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
250 |
} else { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
251 |
try { |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
252 |
return deferredTypeCompleter.complete(this, resultInfo, deferredAttrContext); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
253 |
} finally { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
254 |
mode = deferredAttrContext.mode; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
255 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
256 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
257 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
258 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
259 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
260 |
/** |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
261 |
* A completer for deferred types. Defines an entry point for type-checking |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
262 |
* a deferred type. |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
263 |
*/ |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
264 |
interface DeferredTypeCompleter { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
265 |
/** |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
266 |
* Entry point for type-checking a deferred type. Depending on the |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
267 |
* circumstances, type-checking could amount to full attribution |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
268 |
* or partial structural check (aka potential applicability). |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
269 |
*/ |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
270 |
Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
271 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
272 |
|
19914 | 273 |
|
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
274 |
/** |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
275 |
* A basic completer for deferred types. This completer type-checks a deferred type |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
276 |
* using attribution; depending on the attribution mode, this could be either standard |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
277 |
* or speculative attribution. |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
278 |
*/ |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
279 |
DeferredTypeCompleter basicCompleter = new DeferredTypeCompleter() { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
280 |
public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
281 |
switch (deferredAttrContext.mode) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
282 |
case SPECULATIVE: |
16566
604ce45d5f23
8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents:
16326
diff
changeset
|
283 |
//Note: if a symbol is imported twice we might do two identical |
604ce45d5f23
8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents:
16326
diff
changeset
|
284 |
//speculative rounds... |
604ce45d5f23
8009820: AssertionError when compiling java code with two identical static imports
mcimadamore
parents:
16326
diff
changeset
|
285 |
Assert.check(dt.mode == null || dt.mode == AttrMode.SPECULATIVE); |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
286 |
JCTree speculativeTree = attribSpeculative(dt.tree, dt.env, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
287 |
resultInfo, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
288 |
annotate.noCreator); |
19914 | 289 |
dt.speculativeCache.put(speculativeTree, resultInfo); |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
290 |
return speculativeTree.type; |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
291 |
case CHECK: |
15717 | 292 |
Assert.check(dt.mode != null); |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
293 |
final boolean oldSpeculative = dt.env.info.isSpeculative; |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
294 |
dt.env.info.isSpeculative = false; |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
295 |
Type out = attr.attribTree(dt.tree, dt.env, resultInfo); |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
296 |
dt.env.info.isSpeculative = oldSpeculative; |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
297 |
return out; |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
298 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
299 |
Assert.error(); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
300 |
return null; |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
301 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
302 |
}; |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
303 |
|
15717 | 304 |
DeferredTypeCompleter dummyCompleter = new DeferredTypeCompleter() { |
305 |
public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) { |
|
306 |
Assert.check(deferredAttrContext.mode == AttrMode.CHECK); |
|
18912
e25cd61d8e59
8020147: Spurious errors when compiling nested stuck lambdas
mcimadamore
parents:
18910
diff
changeset
|
307 |
return dt.tree.type = Type.stuckType; |
15717 | 308 |
} |
309 |
}; |
|
310 |
||
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
311 |
/** |
19914 | 312 |
* Policy for detecting stuck expressions. Different criteria might cause |
313 |
* an expression to be judged as stuck, depending on whether the check |
|
314 |
* is performed during overload resolution or after most specific. |
|
315 |
*/ |
|
316 |
interface DeferredStuckPolicy { |
|
317 |
/** |
|
318 |
* Has the policy detected that a given expression should be considered stuck? |
|
319 |
*/ |
|
320 |
boolean isStuck(); |
|
321 |
/** |
|
322 |
* Get the set of inference variables a given expression depends upon. |
|
323 |
*/ |
|
324 |
Set<Type> stuckVars(); |
|
325 |
/** |
|
326 |
* Get the set of inference variables which might get new constraints |
|
327 |
* if a given expression is being type-checked. |
|
328 |
*/ |
|
329 |
Set<Type> depVars(); |
|
330 |
} |
|
331 |
||
332 |
/** |
|
333 |
* Basic stuck policy; an expression is never considered to be stuck. |
|
334 |
*/ |
|
335 |
DeferredStuckPolicy dummyStuckPolicy = new DeferredStuckPolicy() { |
|
336 |
@Override |
|
337 |
public boolean isStuck() { |
|
338 |
return false; |
|
339 |
} |
|
340 |
@Override |
|
341 |
public Set<Type> stuckVars() { |
|
342 |
return Collections.emptySet(); |
|
343 |
} |
|
344 |
@Override |
|
345 |
public Set<Type> depVars() { |
|
346 |
return Collections.emptySet(); |
|
347 |
} |
|
348 |
}; |
|
349 |
||
350 |
/** |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
351 |
* The 'mode' in which the deferred type is to be type-checked |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
352 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
353 |
public enum AttrMode { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
354 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
355 |
* A speculative type-checking round is used during overload resolution |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
356 |
* mainly to generate constraints on inference variables. Side-effects |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
357 |
* arising from type-checking the expression associated with the deferred |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
358 |
* type are reversed after the speculative round finishes. This means the |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
359 |
* expression tree will be left in a blank state. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
360 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
361 |
SPECULATIVE, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
362 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
363 |
* This is the plain type-checking mode. Produces side-effects on the underlying AST node |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
364 |
*/ |
22163 | 365 |
CHECK |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
366 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
367 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
368 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
369 |
* Routine that performs speculative type-checking; the input AST node is |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
370 |
* cloned (to avoid side-effects cause by Attr) and compiler state is |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
371 |
* restored after type-checking. All diagnostics (but critical ones) are |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
372 |
* disabled during speculative type-checking. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
373 |
*/ |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
374 |
JCTree attribSpeculative(JCTree tree, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
375 |
Env<AttrContext> env, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
376 |
ResultInfo resultInfo, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
377 |
Annotate.PositionCreator creator) { |
22163 | 378 |
final JCTree newTree = new TreeCopier<>(make).copy(tree); |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25275
diff
changeset
|
379 |
Env<AttrContext> speculativeEnv = env.dup(newTree, env.info.dup(env.info.scope.dupUnshared(env.info.scope.owner))); |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
380 |
speculativeEnv.info.isSpeculative = true; |
14538
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
381 |
Log.DeferredDiagnosticHandler deferredDiagnosticHandler = |
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
382 |
new Log.DeferredDiagnosticHandler(log, new Filter<JCDiagnostic>() { |
16309
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
383 |
public boolean accepts(final JCDiagnostic d) { |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
384 |
class PosScanner extends TreeScanner { |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
385 |
boolean found = false; |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
386 |
|
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
387 |
@Override |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
388 |
public void scan(JCTree tree) { |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
389 |
if (tree != null && |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
390 |
tree.pos() == d.getDiagnosticPosition()) { |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
391 |
found = true; |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
392 |
} |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
393 |
super.scan(tree); |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
394 |
} |
22163 | 395 |
} |
16309
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
396 |
PosScanner posScanner = new PosScanner(); |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
397 |
posScanner.scan(newTree); |
db71f8ecc136
8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
mcimadamore
parents:
16294
diff
changeset
|
398 |
return posScanner.found; |
14538
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
399 |
} |
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
400 |
}); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
401 |
try { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
402 |
attr.attribTree(newTree, speculativeEnv, resultInfo); |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
403 |
annotate.typeAnnotateExprLater(newTree, speculativeEnv, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
404 |
speculativeEnv.info.scope.owner, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
405 |
newTree.pos(), creator); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
406 |
unenterScanner.scan(newTree); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
407 |
return newTree; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
408 |
} finally { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
409 |
unenterScanner.scan(newTree); |
14538
384681be798f
8003299: Cleanup javac Log support for deferred diagnostics
jjg
parents:
14359
diff
changeset
|
410 |
log.popDiagnosticHandler(deferredDiagnosticHandler); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
411 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
412 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
413 |
//where |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
414 |
protected UnenterScanner unenterScanner = new UnenterScanner(); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
415 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
416 |
class UnenterScanner extends TreeScanner { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
417 |
@Override |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
418 |
public void visitClassDef(JCClassDecl tree) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
419 |
ClassSymbol csym = tree.sym; |
14547 | 420 |
//if something went wrong during method applicability check |
421 |
//it is possible that nested expressions inside argument expression |
|
422 |
//are left unchecked - in such cases there's nothing to clean up. |
|
423 |
if (csym == null) return; |
|
25007 | 424 |
typeEnvs.remove(csym); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
425 |
chk.compiled.remove(csym.flatname); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
426 |
syms.classes.remove(csym.flatname); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
427 |
super.visitClassDef(tree); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
428 |
} |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
429 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
430 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
431 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
432 |
* A deferred context is created on each method check. A deferred context is |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
433 |
* used to keep track of information associated with the method check, such as |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
434 |
* the symbol of the method being checked, the overload resolution phase, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
435 |
* the kind of attribution mode to be applied to deferred types and so forth. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
436 |
* As deferred types are processed (by the method check routine) stuck AST nodes |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
437 |
* are added (as new deferred attribution nodes) to this context. The complete() |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
438 |
* routine makes sure that all pending nodes are properly processed, by |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
439 |
* progressively instantiating all inference variables on which one or more |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
440 |
* deferred attribution node is stuck. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
441 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
442 |
class DeferredAttrContext { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
443 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
444 |
/** attribution mode */ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
445 |
final AttrMode mode; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
446 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
447 |
/** symbol of the method being checked */ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
448 |
final Symbol msym; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
449 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
450 |
/** method resolution step */ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
451 |
final Resolve.MethodResolutionPhase phase; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
452 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
453 |
/** inference context */ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
454 |
final InferenceContext inferenceContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
455 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
456 |
/** parent deferred context */ |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
457 |
final DeferredAttrContext parent; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
458 |
|
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
459 |
/** Warner object to report warnings */ |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
460 |
final Warner warn; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
461 |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
462 |
/** list of deferred attribution nodes to be processed */ |
22163 | 463 |
ArrayList<DeferredAttrNode> deferredAttrNodes = new ArrayList<>(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
464 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
465 |
DeferredAttrContext(AttrMode mode, Symbol msym, MethodResolutionPhase phase, |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
466 |
InferenceContext inferenceContext, DeferredAttrContext parent, Warner warn) { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
467 |
this.mode = mode; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
468 |
this.msym = msym; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
469 |
this.phase = phase; |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
470 |
this.parent = parent; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
471 |
this.warn = warn; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
472 |
this.inferenceContext = inferenceContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
473 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
474 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
475 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
476 |
* Adds a node to the list of deferred attribution nodes - used by Resolve.rawCheckArgumentsApplicable |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
477 |
* Nodes added this way act as 'roots' for the out-of-order method checking process. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
478 |
*/ |
19914 | 479 |
void addDeferredAttrNode(final DeferredType dt, ResultInfo resultInfo, |
480 |
DeferredStuckPolicy deferredStuckPolicy) { |
|
481 |
deferredAttrNodes.add(new DeferredAttrNode(dt, resultInfo, deferredStuckPolicy)); |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
482 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
483 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
484 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
485 |
* Incrementally process all nodes, by skipping 'stuck' nodes and attributing |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
486 |
* 'unstuck' ones. If at any point no progress can be made (no 'unstuck' nodes) |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
487 |
* some inference variable might get eagerly instantiated so that all nodes |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
488 |
* can be type-checked. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
489 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
490 |
void complete() { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
491 |
while (!deferredAttrNodes.isEmpty()) { |
22163 | 492 |
Map<Type, Set<Type>> depVarsMap = new LinkedHashMap<>(); |
19914 | 493 |
List<Type> stuckVars = List.nil(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
494 |
boolean progress = false; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
495 |
//scan a defensive copy of the node list - this is because a deferred |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
496 |
//attribution round can add new nodes to the list |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
497 |
for (DeferredAttrNode deferredAttrNode : List.from(deferredAttrNodes)) { |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
498 |
if (!deferredAttrNode.process(this)) { |
19914 | 499 |
List<Type> restStuckVars = |
500 |
List.from(deferredAttrNode.deferredStuckPolicy.stuckVars()) |
|
501 |
.intersect(inferenceContext.restvars()); |
|
502 |
stuckVars = stuckVars.prependList(restStuckVars); |
|
503 |
//update dependency map |
|
504 |
for (Type t : List.from(deferredAttrNode.deferredStuckPolicy.depVars()) |
|
505 |
.intersect(inferenceContext.restvars())) { |
|
506 |
Set<Type> prevDeps = depVarsMap.get(t); |
|
507 |
if (prevDeps == null) { |
|
22163 | 508 |
prevDeps = new LinkedHashSet<>(); |
19914 | 509 |
depVarsMap.put(t, prevDeps); |
510 |
} |
|
511 |
prevDeps.addAll(restStuckVars); |
|
512 |
} |
|
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
513 |
} else { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
514 |
deferredAttrNodes.remove(deferredAttrNode); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
515 |
progress = true; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
516 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
517 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
518 |
if (!progress) { |
19914 | 519 |
DeferredAttrContext dac = this; |
520 |
while (dac != emptyDeferredAttrContext) { |
|
521 |
if (dac.mode == AttrMode.SPECULATIVE) { |
|
522 |
//unsticking does not take place during overload |
|
523 |
break; |
|
524 |
} |
|
525 |
dac = dac.parent; |
|
526 |
} |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
527 |
//remove all variables that have already been instantiated |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
528 |
//from the list of stuck variables |
19914 | 529 |
try { |
530 |
inferenceContext.solveAny(stuckVars, depVarsMap, warn); |
|
531 |
inferenceContext.notifyChange(); |
|
532 |
} catch (Infer.GraphStrategy.NodeNotFoundException ex) { |
|
533 |
//this means that we are in speculative mode and the |
|
534 |
//set of contraints are too tight for progess to be made. |
|
535 |
//Just leave the remaining expressions as stuck. |
|
536 |
break; |
|
537 |
} |
|
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
538 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
539 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
540 |
} |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
541 |
} |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
542 |
|
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
543 |
/** |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
544 |
* Class representing a deferred attribution node. It keeps track of |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
545 |
* a deferred type, along with the expected target type information. |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
546 |
*/ |
19914 | 547 |
class DeferredAttrNode { |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
548 |
|
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
549 |
/** underlying deferred type */ |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
550 |
DeferredType dt; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
551 |
|
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
552 |
/** underlying target type information */ |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
553 |
ResultInfo resultInfo; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
554 |
|
19914 | 555 |
/** stuck policy associated with this node */ |
556 |
DeferredStuckPolicy deferredStuckPolicy; |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
557 |
|
19914 | 558 |
DeferredAttrNode(DeferredType dt, ResultInfo resultInfo, DeferredStuckPolicy deferredStuckPolicy) { |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
559 |
this.dt = dt; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
560 |
this.resultInfo = resultInfo; |
19914 | 561 |
this.deferredStuckPolicy = deferredStuckPolicy; |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
562 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
563 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
564 |
/** |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
565 |
* Process a deferred attribution node. |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
566 |
* Invariant: a stuck node cannot be processed. |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
567 |
*/ |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
568 |
@SuppressWarnings("fallthrough") |
19914 | 569 |
boolean process(final DeferredAttrContext deferredAttrContext) { |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
570 |
switch (deferredAttrContext.mode) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
571 |
case SPECULATIVE: |
19914 | 572 |
if (deferredStuckPolicy.isStuck()) { |
573 |
dt.check(resultInfo, dummyStuckPolicy, new StructuralStuckChecker()); |
|
574 |
return true; |
|
575 |
} else { |
|
576 |
Assert.error("Cannot get here"); |
|
577 |
} |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
578 |
case CHECK: |
19914 | 579 |
if (deferredStuckPolicy.isStuck()) { |
15717 | 580 |
//stuck expression - see if we can propagate |
581 |
if (deferredAttrContext.parent != emptyDeferredAttrContext && |
|
19914 | 582 |
Type.containsAny(deferredAttrContext.parent.inferenceContext.inferencevars, |
583 |
List.from(deferredStuckPolicy.stuckVars()))) { |
|
584 |
deferredAttrContext.parent.addDeferredAttrNode(dt, |
|
585 |
resultInfo.dup(new Check.NestedCheckContext(resultInfo.checkContext) { |
|
586 |
@Override |
|
587 |
public InferenceContext inferenceContext() { |
|
588 |
return deferredAttrContext.parent.inferenceContext; |
|
589 |
} |
|
590 |
@Override |
|
591 |
public DeferredAttrContext deferredAttrContext() { |
|
592 |
return deferredAttrContext.parent; |
|
593 |
} |
|
594 |
}), deferredStuckPolicy); |
|
595 |
dt.tree.type = Type.stuckType; |
|
15717 | 596 |
return true; |
597 |
} else { |
|
598 |
return false; |
|
599 |
} |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
600 |
} else { |
19914 | 601 |
ResultInfo instResultInfo = |
602 |
resultInfo.dup(deferredAttrContext.inferenceContext.asInstType(resultInfo.pt)); |
|
603 |
dt.check(instResultInfo, dummyStuckPolicy, basicCompleter); |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
604 |
return true; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
605 |
} |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
606 |
default: |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
607 |
throw new AssertionError("Bad mode"); |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
608 |
} |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
609 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
610 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
611 |
/** |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
612 |
* Structural checker for stuck expressions |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
613 |
*/ |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
614 |
class StructuralStuckChecker extends TreeScanner implements DeferredTypeCompleter { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
615 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
616 |
ResultInfo resultInfo; |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
617 |
InferenceContext inferenceContext; |
19914 | 618 |
Env<AttrContext> env; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
619 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
620 |
public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
621 |
this.resultInfo = resultInfo; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
622 |
this.inferenceContext = deferredAttrContext.inferenceContext; |
19914 | 623 |
this.env = dt.env; |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
624 |
dt.tree.accept(this); |
19914 | 625 |
dt.speculativeCache.put(stuckTree, resultInfo); |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
626 |
return Type.noType; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
627 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
628 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
629 |
@Override |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
630 |
public void visitLambda(JCLambda tree) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
631 |
Check.CheckContext checkContext = resultInfo.checkContext; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
632 |
Type pt = resultInfo.pt; |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
633 |
if (!inferenceContext.inferencevars.contains(pt)) { |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
634 |
//must be a functional descriptor |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
635 |
Type descriptorType = null; |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
636 |
try { |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
637 |
descriptorType = types.findDescriptorType(pt); |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
638 |
} catch (Types.FunctionDescriptorLookupError ex) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
639 |
checkContext.report(null, ex.getDiagnostic()); |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
640 |
} |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
641 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
642 |
if (descriptorType.getParameterTypes().length() != tree.params.length()) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
643 |
checkContext.report(tree, |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
644 |
diags.fragment("incompatible.arg.types.in.lambda")); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
645 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
646 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
647 |
Type currentReturnType = descriptorType.getReturnType(); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
648 |
boolean returnTypeIsVoid = currentReturnType.hasTag(VOID); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
649 |
if (tree.getBodyKind() == BodyKind.EXPRESSION) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
650 |
boolean isExpressionCompatible = !returnTypeIsVoid || |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
651 |
TreeInfo.isExpressionStatement((JCExpression)tree.getBody()); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
652 |
if (!isExpressionCompatible) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
653 |
resultInfo.checkContext.report(tree.pos(), |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
654 |
diags.fragment("incompatible.ret.type.in.lambda", |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
655 |
diags.fragment("missing.ret.val", currentReturnType))); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
656 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
657 |
} else { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
658 |
LambdaBodyStructChecker lambdaBodyChecker = |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
659 |
new LambdaBodyStructChecker(); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
660 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
661 |
tree.body.accept(lambdaBodyChecker); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
662 |
boolean isVoidCompatible = lambdaBodyChecker.isVoidCompatible; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
663 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
664 |
if (returnTypeIsVoid) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
665 |
if (!isVoidCompatible) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
666 |
resultInfo.checkContext.report(tree.pos(), |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
667 |
diags.fragment("unexpected.ret.val")); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
668 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
669 |
} else { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
670 |
boolean isValueCompatible = lambdaBodyChecker.isPotentiallyValueCompatible |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
671 |
&& !canLambdaBodyCompleteNormally(tree); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
672 |
if (!isValueCompatible && !isVoidCompatible) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
673 |
log.error(tree.body.pos(), |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
674 |
"lambda.body.neither.value.nor.void.compatible"); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
675 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
676 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
677 |
if (!isValueCompatible) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
678 |
resultInfo.checkContext.report(tree.pos(), |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
679 |
diags.fragment("incompatible.ret.type.in.lambda", |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
680 |
diags.fragment("missing.ret.val", currentReturnType))); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
681 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
682 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
683 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
684 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
685 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
686 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
687 |
boolean canLambdaBodyCompleteNormally(JCLambda tree) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
688 |
JCLambda newTree = new TreeCopier<>(make).copy(tree); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
689 |
/* attr.lambdaEnv will create a meaningful env for the |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
690 |
* lambda expression. This is specially useful when the |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
691 |
* lambda is used as the init of a field. But we need to |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
692 |
* remove any added symbol. |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
693 |
*/ |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
694 |
Env<AttrContext> localEnv = attr.lambdaEnv(newTree, env); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
695 |
try { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
696 |
List<JCVariableDecl> tmpParams = newTree.params; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
697 |
while (tmpParams.nonEmpty()) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
698 |
tmpParams.head.vartype = make.at(tmpParams.head).Type(syms.errType); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
699 |
tmpParams = tmpParams.tail; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
700 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
701 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
702 |
attr.attribStats(newTree.params, localEnv); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
703 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
704 |
/* set pt to Type.noType to avoid generating any bound |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
705 |
* which may happen if lambda's return type is an |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
706 |
* inference variable |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
707 |
*/ |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
708 |
Attr.ResultInfo bodyResultInfo = attr.new ResultInfo(VAL, Type.noType); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
709 |
localEnv.info.returnResult = bodyResultInfo; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
710 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
711 |
// discard any log output |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
712 |
Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
713 |
try { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
714 |
JCBlock body = (JCBlock)newTree.body; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
715 |
/* we need to attribute the lambda body before |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
716 |
* doing the aliveness analysis. This is because |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
717 |
* constant folding occurs during attribution |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
718 |
* and the reachability of some statements depends |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
719 |
* on constant values, for example: |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
720 |
* |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
721 |
* while (true) {...} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
722 |
*/ |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
723 |
attr.attribStats(body.stats, localEnv); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
724 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
725 |
attr.preFlow(newTree); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
726 |
/* make an aliveness / reachability analysis of the lambda |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
727 |
* to determine if it can complete normally |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
728 |
*/ |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
729 |
flow.analyzeLambda(localEnv, newTree, make, true); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
730 |
} finally { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
731 |
log.popDiagnosticHandler(diagHandler); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
732 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
733 |
return newTree.canCompleteNormally; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
734 |
} finally { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
735 |
JCBlock body = (JCBlock)newTree.body; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
736 |
unenterScanner.scan(body.stats); |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
737 |
localEnv.info.scope.leave(); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
738 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
739 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
740 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
741 |
@Override |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
742 |
public void visitNewClass(JCNewClass tree) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
743 |
//do nothing |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
744 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
745 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
746 |
@Override |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
747 |
public void visitApply(JCMethodInvocation tree) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
748 |
//do nothing |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
749 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
750 |
|
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
751 |
@Override |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
752 |
public void visitReference(JCMemberReference tree) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
753 |
Check.CheckContext checkContext = resultInfo.checkContext; |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
754 |
Type pt = resultInfo.pt; |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
755 |
if (!inferenceContext.inferencevars.contains(pt)) { |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
756 |
try { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
757 |
types.findDescriptorType(pt); |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
758 |
} catch (Types.FunctionDescriptorLookupError ex) { |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
759 |
checkContext.report(null, ex.getDiagnostic()); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
760 |
} |
19914 | 761 |
Env<AttrContext> localEnv = env.dup(tree); |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
762 |
JCExpression exprTree = |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
763 |
(JCExpression)attribSpeculative(tree.getQualifierExpression(), |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
764 |
localEnv, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
765 |
attr.memberReferenceQualifierResult(tree), |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
766 |
annotate.methodRefCreator(tree.pos)); |
20249
93f8eae31092
6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents:
19914
diff
changeset
|
767 |
ListBuffer<Type> argtypes = new ListBuffer<>(); |
19914 | 768 |
for (Type t : types.findDescriptorType(pt).getParameterTypes()) { |
769 |
argtypes.append(Type.noType); |
|
770 |
} |
|
771 |
JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree); |
|
772 |
mref2.expr = exprTree; |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
773 |
Symbol lookupSym = |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
774 |
rs.resolveMemberReferenceByArity(localEnv, mref2, exprTree.type, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
775 |
tree.name, argtypes.toList(), inferenceContext); |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
776 |
switch (lookupSym.kind) { |
16294
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
777 |
//note: as argtypes are erroneous types, type-errors must |
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
778 |
//have been caused by arity mismatch |
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
779 |
case Kinds.ABSENT_MTH: |
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
780 |
case Kinds.WRONG_MTH: |
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
781 |
case Kinds.WRONG_MTHS: |
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
782 |
case Kinds.WRONG_STATICNESS: |
19914 | 783 |
checkContext.report(tree, diags.fragment("incompatible.arg.types.in.mref")); |
16294
0c291a3cd60d
8007462: Fix provisional applicability for method references
mcimadamore
parents:
15717
diff
changeset
|
784 |
} |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
785 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
786 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
787 |
} |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
788 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
789 |
/* This visitor looks for return statements, its analysis will determine if |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
790 |
* a lambda body is void or value compatible. We must analyze return |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
791 |
* statements contained in the lambda body only, thus any return statement |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
792 |
* contained in an inner class or inner lambda body, should be ignored. |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
793 |
*/ |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
794 |
class LambdaBodyStructChecker extends TreeScanner { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
795 |
boolean isVoidCompatible = true; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
796 |
boolean isPotentiallyValueCompatible = true; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
797 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
798 |
@Override |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
799 |
public void visitClassDef(JCClassDecl tree) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
800 |
// do nothing |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
801 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
802 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
803 |
@Override |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
804 |
public void visitLambda(JCLambda tree) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
805 |
// do nothing |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
806 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
807 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
808 |
@Override |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
809 |
public void visitNewClass(JCNewClass tree) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
810 |
// do nothing |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
811 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
812 |
|
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
813 |
@Override |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
814 |
public void visitReturn(JCReturn tree) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
815 |
if (tree.expr != null) { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
816 |
isVoidCompatible = false; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
817 |
} else { |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
818 |
isPotentiallyValueCompatible = false; |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
819 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
820 |
} |
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
821 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
822 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
823 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
824 |
/** an empty deferred attribution context - all methods throw exceptions */ |
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
825 |
final DeferredAttrContext emptyDeferredAttrContext; |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
826 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
827 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
828 |
* Map a list of types possibly containing one or more deferred types |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
829 |
* into a list of ordinary types. Each deferred type D is mapped into a type T, |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
830 |
* where T is computed by retrieving the type that has already been |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
831 |
* computed for D during a previous deferred attribution round of the given kind. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
832 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
833 |
class DeferredTypeMap extends Type.Mapping { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
834 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
835 |
DeferredAttrContext deferredAttrContext; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
836 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
837 |
protected DeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
838 |
super(String.format("deferredTypeMap[%s]", mode)); |
15706
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
839 |
this.deferredAttrContext = new DeferredAttrContext(mode, msym, phase, |
37a81a6987ac
8007479: Refactor DeferredAttrContext so that it points to parent context
mcimadamore
parents:
15705
diff
changeset
|
840 |
infer.emptyContext, emptyDeferredAttrContext, types.noWarnings); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
841 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
842 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
843 |
@Override |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
844 |
public Type apply(Type t) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14258
diff
changeset
|
845 |
if (!t.hasTag(DEFERRED)) { |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
846 |
return t.map(this); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
847 |
} else { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
848 |
DeferredType dt = (DeferredType)t; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
849 |
return typeOf(dt); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
850 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
851 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
852 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
853 |
protected Type typeOf(DeferredType dt) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
854 |
switch (deferredAttrContext.mode) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
855 |
case CHECK: |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
856 |
return dt.tree.type == null ? Type.noType : dt.tree.type; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
857 |
case SPECULATIVE: |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
858 |
return dt.speculativeType(deferredAttrContext.msym, deferredAttrContext.phase); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
859 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
860 |
Assert.error(); |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
861 |
return null; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
862 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
863 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
864 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
865 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
866 |
* Specialized recovery deferred mapping. |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
867 |
* Each deferred type D is mapped into a type T, where T is computed either by |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
868 |
* (i) retrieving the type that has already been computed for D during a previous |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
869 |
* attribution round (as before), or (ii) by synthesizing a new type R for D |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
870 |
* (the latter step is useful in a recovery scenario). |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
871 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
872 |
public class RecoveryDeferredTypeMap extends DeferredTypeMap { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
873 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
874 |
public RecoveryDeferredTypeMap(AttrMode mode, Symbol msym, MethodResolutionPhase phase) { |
14547 | 875 |
super(mode, msym, phase != null ? phase : MethodResolutionPhase.BOX); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
876 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
877 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
878 |
@Override |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
879 |
protected Type typeOf(DeferredType dt) { |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
880 |
Type owntype = super.typeOf(dt); |
14547 | 881 |
return owntype == Type.noType ? |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
882 |
recover(dt) : owntype; |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
883 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
884 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
885 |
/** |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
886 |
* Synthesize a type for a deferred type that hasn't been previously |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
887 |
* reduced to an ordinary type. Functional deferred types and conditionals |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
888 |
* are mapped to themselves, in order to have a richer diagnostic |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
889 |
* representation. Remaining deferred types are attributed using |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
890 |
* a default expected type (j.l.Object). |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
891 |
*/ |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
892 |
private Type recover(DeferredType dt) { |
18902 | 893 |
dt.check(attr.new RecoveryInfo(deferredAttrContext) { |
894 |
@Override |
|
895 |
protected Type check(DiagnosticPosition pos, Type found) { |
|
896 |
return chk.checkNonVoid(pos, super.check(pos, found)); |
|
897 |
} |
|
898 |
}); |
|
14547 | 899 |
return super.apply(dt); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
900 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
901 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
902 |
|
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
903 |
/** |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
904 |
* A special tree scanner that would only visit portions of a given tree. |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
905 |
* The set of nodes visited by the scanner can be customized at construction-time. |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
906 |
*/ |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
907 |
abstract static class FilterScanner extends TreeScanner { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
908 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
909 |
final Filter<JCTree> treeFilter; |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
910 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
911 |
FilterScanner(final Set<JCTree.Tag> validTags) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
912 |
this.treeFilter = new Filter<JCTree>() { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
913 |
public boolean accepts(JCTree t) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
914 |
return validTags.contains(t.getTag()); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
915 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
916 |
}; |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
917 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
918 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
919 |
@Override |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
920 |
public void scan(JCTree tree) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
921 |
if (tree != null) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
922 |
if (treeFilter.accepts(tree)) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
923 |
super.scan(tree); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
924 |
} else { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
925 |
skip(tree); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
926 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
927 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
928 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
929 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
930 |
/** |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
931 |
* handler that is executed when a node has been discarded |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
932 |
*/ |
24066
1dfb66929538
8029718: Should always use lambda body structure to disambiguate overload resolution
vromero
parents:
22163
diff
changeset
|
933 |
void skip(JCTree tree) {} |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
934 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
935 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
936 |
/** |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
937 |
* A tree scanner suitable for visiting the target-type dependent nodes of |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
938 |
* a given argument expression. |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
939 |
*/ |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
940 |
static class PolyScanner extends FilterScanner { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
941 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
942 |
PolyScanner() { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
943 |
super(EnumSet.of(CONDEXPR, PARENS, LAMBDA, REFERENCE)); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
944 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
945 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
946 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
947 |
/** |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
948 |
* A tree scanner suitable for visiting the target-type dependent nodes nested |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
949 |
* within a lambda expression body. |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
950 |
*/ |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
951 |
static class LambdaReturnScanner extends FilterScanner { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
952 |
|
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
953 |
LambdaReturnScanner() { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
954 |
super(EnumSet.of(BLOCK, CASE, CATCH, DOLOOP, FOREACHLOOP, |
25275
e5e9bf4b8c49
8042759: Lambda returning implicitly-typed lambdas considered pertinent to applicability
vromero
parents:
25007
diff
changeset
|
955 |
FORLOOP, IF, RETURN, SYNCHRONIZED, SWITCH, TRY, WHILELOOP)); |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
956 |
} |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
957 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
958 |
|
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
959 |
/** |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
960 |
* This visitor is used to check that structural expressions conform |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
961 |
* to their target - this step is required as inference could end up |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
962 |
* inferring types that make some of the nested expressions incompatible |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
963 |
* with their corresponding instantiated target |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
964 |
*/ |
19914 | 965 |
class CheckStuckPolicy extends PolyScanner implements DeferredStuckPolicy, Infer.FreeTypeListener { |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
966 |
|
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
967 |
Type pt; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
968 |
Infer.InferenceContext inferenceContext; |
22163 | 969 |
Set<Type> stuckVars = new LinkedHashSet<>(); |
970 |
Set<Type> depVars = new LinkedHashSet<>(); |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
971 |
|
19914 | 972 |
@Override |
973 |
public boolean isStuck() { |
|
974 |
return !stuckVars.isEmpty(); |
|
975 |
} |
|
976 |
||
977 |
@Override |
|
978 |
public Set<Type> stuckVars() { |
|
979 |
return stuckVars; |
|
980 |
} |
|
981 |
||
982 |
@Override |
|
983 |
public Set<Type> depVars() { |
|
984 |
return depVars; |
|
985 |
} |
|
986 |
||
987 |
public CheckStuckPolicy(ResultInfo resultInfo, DeferredType dt) { |
|
988 |
this.pt = resultInfo.pt; |
|
989 |
this.inferenceContext = resultInfo.checkContext.inferenceContext(); |
|
990 |
scan(dt.tree); |
|
991 |
if (!stuckVars.isEmpty()) { |
|
992 |
resultInfo.checkContext.inferenceContext() |
|
993 |
.addFreeTypeListener(List.from(stuckVars), this); |
|
994 |
} |
|
995 |
} |
|
996 |
||
997 |
@Override |
|
998 |
public void typesInferred(InferenceContext inferenceContext) { |
|
999 |
stuckVars.clear(); |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1000 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1001 |
|
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1002 |
@Override |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1003 |
public void visitLambda(JCLambda tree) { |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1004 |
if (inferenceContext.inferenceVars().contains(pt)) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1005 |
stuckVars.add(pt); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1006 |
} |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
1007 |
if (!types.isFunctionalInterface(pt)) { |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1008 |
return; |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1009 |
} |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1010 |
Type descType = types.findDescriptorType(pt); |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1011 |
List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes()); |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
1012 |
if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT && |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1013 |
freeArgVars.nonEmpty()) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1014 |
stuckVars.addAll(freeArgVars); |
19914 | 1015 |
depVars.addAll(inferenceContext.freeVarsIn(descType.getReturnType())); |
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1016 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1017 |
scanLambdaBody(tree, descType.getReturnType()); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1018 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1019 |
|
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1020 |
@Override |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1021 |
public void visitReference(JCMemberReference tree) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1022 |
scan(tree.expr); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1023 |
if (inferenceContext.inferenceVars().contains(pt)) { |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1024 |
stuckVars.add(pt); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1025 |
return; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1026 |
} |
15374
fb8f6acf09cc
8005244: Implement overload resolution as per latest spec EDR
mcimadamore
parents:
15039
diff
changeset
|
1027 |
if (!types.isFunctionalInterface(pt)) { |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1028 |
return; |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1029 |
} |
14547 | 1030 |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1031 |
Type descType = types.findDescriptorType(pt); |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1032 |
List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes()); |
19914 | 1033 |
if (freeArgVars.nonEmpty() && |
1034 |
tree.overloadKind == JCMemberReference.OverloadKind.OVERLOADED) { |
|
1035 |
stuckVars.addAll(freeArgVars); |
|
1036 |
depVars.addAll(inferenceContext.freeVarsIn(descType.getReturnType())); |
|
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
1037 |
} |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1038 |
} |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1039 |
|
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1040 |
void scanLambdaBody(JCLambda lambda, final Type pt) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1041 |
if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) { |
19914 | 1042 |
Type prevPt = this.pt; |
1043 |
try { |
|
1044 |
this.pt = pt; |
|
1045 |
scan(lambda.body); |
|
1046 |
} finally { |
|
1047 |
this.pt = prevPt; |
|
1048 |
} |
|
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1049 |
} else { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1050 |
LambdaReturnScanner lambdaScanner = new LambdaReturnScanner() { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1051 |
@Override |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1052 |
public void visitReturn(JCReturn tree) { |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1053 |
if (tree.expr != null) { |
19914 | 1054 |
Type prevPt = CheckStuckPolicy.this.pt; |
1055 |
try { |
|
1056 |
CheckStuckPolicy.this.pt = pt; |
|
1057 |
CheckStuckPolicy.this.scan(tree.expr); |
|
1058 |
} finally { |
|
1059 |
CheckStuckPolicy.this.pt = prevPt; |
|
1060 |
} |
|
15039
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1061 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1062 |
} |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1063 |
}; |
80190ab051c0
8005184: Restructure DeferredAttr to allow pluggable deferred type completers
mcimadamore
parents:
14547
diff
changeset
|
1064 |
lambdaScanner.scan(lambda.body); |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14057
diff
changeset
|
1065 |
} |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
1066 |
} |
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
1067 |
} |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1068 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1069 |
/** |
19914 | 1070 |
* This visitor is used to check that structural expressions conform |
1071 |
* to their target - this step is required as inference could end up |
|
1072 |
* inferring types that make some of the nested expressions incompatible |
|
1073 |
* with their corresponding instantiated target |
|
1074 |
*/ |
|
1075 |
class OverloadStuckPolicy extends CheckStuckPolicy implements DeferredStuckPolicy { |
|
1076 |
||
1077 |
boolean stuck; |
|
1078 |
||
1079 |
@Override |
|
1080 |
public boolean isStuck() { |
|
1081 |
return super.isStuck() || stuck; |
|
1082 |
} |
|
1083 |
||
1084 |
public OverloadStuckPolicy(ResultInfo resultInfo, DeferredType dt) { |
|
1085 |
super(resultInfo, dt); |
|
1086 |
} |
|
1087 |
||
1088 |
@Override |
|
1089 |
public void visitLambda(JCLambda tree) { |
|
1090 |
super.visitLambda(tree); |
|
1091 |
if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT) { |
|
1092 |
stuck = true; |
|
1093 |
} |
|
1094 |
} |
|
1095 |
||
1096 |
@Override |
|
1097 |
public void visitReference(JCMemberReference tree) { |
|
1098 |
super.visitReference(tree); |
|
1099 |
if (tree.overloadKind == JCMemberReference.OverloadKind.OVERLOADED) { |
|
1100 |
stuck = true; |
|
1101 |
} |
|
1102 |
} |
|
1103 |
} |
|
1104 |
||
1105 |
/** |
|
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1106 |
* Does the argument expression {@code expr} need speculative type-checking? |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1107 |
*/ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1108 |
boolean isDeferred(Env<AttrContext> env, JCExpression expr) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1109 |
DeferredChecker dc = new DeferredChecker(env); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1110 |
dc.scan(expr); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1111 |
return dc.result.isPoly(); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1112 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1113 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1114 |
/** |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1115 |
* The kind of an argument expression. This is used by the analysis that |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1116 |
* determines as to whether speculative attribution is necessary. |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1117 |
*/ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1118 |
enum ArgumentExpressionKind { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1119 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1120 |
/** kind that denotes poly argument expression */ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1121 |
POLY, |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1122 |
/** kind that denotes a standalone expression */ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1123 |
NO_POLY, |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1124 |
/** kind that denotes a primitive/boxed standalone expression */ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1125 |
PRIMITIVE; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1126 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1127 |
/** |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1128 |
* Does this kind denote a poly argument expression |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1129 |
*/ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1130 |
public final boolean isPoly() { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1131 |
return this == POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1132 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1133 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1134 |
/** |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1135 |
* Does this kind denote a primitive standalone expression |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1136 |
*/ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1137 |
public final boolean isPrimitive() { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1138 |
return this == PRIMITIVE; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1139 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1140 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1141 |
/** |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1142 |
* Compute the kind of a standalone expression of a given type |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1143 |
*/ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1144 |
static ArgumentExpressionKind standaloneKind(Type type, Types types) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1145 |
return types.unboxedTypeOrType(type).isPrimitive() ? |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1146 |
ArgumentExpressionKind.PRIMITIVE : |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1147 |
ArgumentExpressionKind.NO_POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1148 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1149 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1150 |
/** |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1151 |
* Compute the kind of a method argument expression given its symbol |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1152 |
*/ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1153 |
static ArgumentExpressionKind methodKind(Symbol sym, Types types) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1154 |
Type restype = sym.type.getReturnType(); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1155 |
if (sym.type.hasTag(FORALL) && |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1156 |
restype.containsAny(((ForAll)sym.type).tvars)) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1157 |
return ArgumentExpressionKind.POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1158 |
} else { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1159 |
return ArgumentExpressionKind.standaloneKind(restype, types); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1160 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1161 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1162 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1163 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1164 |
/** |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1165 |
* Tree scanner used for checking as to whether an argument expression |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1166 |
* requires speculative attribution |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1167 |
*/ |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1168 |
final class DeferredChecker extends FilterScanner { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1169 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1170 |
Env<AttrContext> env; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1171 |
ArgumentExpressionKind result; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1172 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1173 |
public DeferredChecker(Env<AttrContext> env) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1174 |
super(deferredCheckerTags); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1175 |
this.env = env; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1176 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1177 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1178 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1179 |
public void visitLambda(JCLambda tree) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1180 |
//a lambda is always a poly expression |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1181 |
result = ArgumentExpressionKind.POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1182 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1183 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1184 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1185 |
public void visitReference(JCMemberReference tree) { |
19914 | 1186 |
//perform arity-based check |
1187 |
Env<AttrContext> localEnv = env.dup(tree); |
|
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
1188 |
JCExpression exprTree = |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
1189 |
(JCExpression)attribSpeculative(tree.getQualifierExpression(), |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
1190 |
localEnv, |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
1191 |
attr.memberReferenceQualifierResult(tree), |
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
1192 |
annotate.methodRefCreator(tree.pos)); |
19914 | 1193 |
JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree); |
1194 |
mref2.expr = exprTree; |
|
21718
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
1195 |
Symbol res = |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
1196 |
rs.getMemberReference(tree, localEnv, mref2, |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
1197 |
exprTree.type, tree.name); |
74a5882faf79
8026231: Look at 'static' flag when checking method references
vromero
parents:
20249
diff
changeset
|
1198 |
tree.sym = res; |
19914 | 1199 |
if (res.kind >= Kinds.ERRONEOUS || |
1200 |
res.type.hasTag(FORALL) || |
|
1201 |
(res.flags() & Flags.VARARGS) != 0 || |
|
1202 |
(TreeInfo.isStaticSelector(exprTree, tree.name.table.names) && |
|
1203 |
exprTree.type.isRaw())) { |
|
1204 |
tree.overloadKind = JCMemberReference.OverloadKind.OVERLOADED; |
|
1205 |
} else { |
|
1206 |
tree.overloadKind = JCMemberReference.OverloadKind.UNOVERLOADED; |
|
1207 |
} |
|
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1208 |
//a method reference is always a poly expression |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1209 |
result = ArgumentExpressionKind.POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1210 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1211 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1212 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1213 |
public void visitTypeCast(JCTypeCast tree) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1214 |
//a cast is always a standalone expression |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1215 |
result = ArgumentExpressionKind.NO_POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1216 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1217 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1218 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1219 |
public void visitConditional(JCConditional tree) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1220 |
scan(tree.truepart); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1221 |
if (!result.isPrimitive()) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1222 |
result = ArgumentExpressionKind.POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1223 |
return; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1224 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1225 |
scan(tree.falsepart); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1226 |
result = reduce(ArgumentExpressionKind.PRIMITIVE); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1227 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1228 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1229 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1230 |
public void visitNewClass(JCNewClass tree) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1231 |
result = (TreeInfo.isDiamond(tree) || attr.findDiamonds) ? |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1232 |
ArgumentExpressionKind.POLY : ArgumentExpressionKind.NO_POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1233 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1234 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1235 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1236 |
public void visitApply(JCMethodInvocation tree) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1237 |
Name name = TreeInfo.name(tree.meth); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1238 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1239 |
//fast path |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1240 |
if (tree.typeargs.nonEmpty() || |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1241 |
name == name.table.names._this || |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1242 |
name == name.table.names._super) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1243 |
result = ArgumentExpressionKind.NO_POLY; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1244 |
return; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1245 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1246 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1247 |
//slow path |
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1248 |
Symbol sym = quicklyResolveMethod(env, tree); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1249 |
|
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1250 |
if (sym == null) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1251 |
result = ArgumentExpressionKind.POLY; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1252 |
return; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1253 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1254 |
|
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1255 |
result = analyzeCandidateMethods(sym, ArgumentExpressionKind.PRIMITIVE, |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1256 |
argumentKindAnalyzer); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1257 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1258 |
//where |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1259 |
private boolean isSimpleReceiver(JCTree rec) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1260 |
switch (rec.getTag()) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1261 |
case IDENT: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1262 |
return true; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1263 |
case SELECT: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1264 |
return isSimpleReceiver(((JCFieldAccess)rec).selected); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1265 |
case TYPEAPPLY: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1266 |
case TYPEARRAY: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1267 |
return true; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1268 |
case ANNOTATED_TYPE: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1269 |
return isSimpleReceiver(((JCAnnotatedType)rec).underlyingType); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1270 |
case APPLY: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1271 |
return true; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1272 |
default: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1273 |
return false; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1274 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1275 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1276 |
private ArgumentExpressionKind reduce(ArgumentExpressionKind kind) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1277 |
return argumentKindAnalyzer.reduce(result, kind); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1278 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1279 |
MethodAnalyzer<ArgumentExpressionKind> argumentKindAnalyzer = |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1280 |
new MethodAnalyzer<ArgumentExpressionKind>() { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1281 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1282 |
public ArgumentExpressionKind process(MethodSymbol ms) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1283 |
return ArgumentExpressionKind.methodKind(ms, types); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1284 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1285 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1286 |
public ArgumentExpressionKind reduce(ArgumentExpressionKind kind1, |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1287 |
ArgumentExpressionKind kind2) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1288 |
switch (kind1) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1289 |
case PRIMITIVE: return kind2; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1290 |
case NO_POLY: return kind2.isPoly() ? kind2 : kind1; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1291 |
case POLY: return kind1; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1292 |
default: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1293 |
Assert.error(); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1294 |
return null; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1295 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1296 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1297 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1298 |
public boolean shouldStop(ArgumentExpressionKind result) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1299 |
return result.isPoly(); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1300 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1301 |
}; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1302 |
|
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1303 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1304 |
public void visitLiteral(JCLiteral tree) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1305 |
Type litType = attr.litType(tree.typetag); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1306 |
result = ArgumentExpressionKind.standaloneKind(litType, types); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1307 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1308 |
|
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1309 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1310 |
void skip(JCTree tree) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1311 |
result = ArgumentExpressionKind.NO_POLY; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1312 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1313 |
|
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1314 |
private Symbol quicklyResolveMethod(Env<AttrContext> env, final JCMethodInvocation tree) { |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1315 |
final JCExpression rec = tree.meth.hasTag(SELECT) ? |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1316 |
((JCFieldAccess)tree.meth).selected : |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1317 |
null; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1318 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1319 |
if (rec != null && !isSimpleReceiver(rec)) { |
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1320 |
return null; |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1321 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1322 |
|
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1323 |
Type site; |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1324 |
|
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1325 |
if (rec != null) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1326 |
if (rec.hasTag(APPLY)) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1327 |
Symbol recSym = quicklyResolveMethod(env, (JCMethodInvocation) rec); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1328 |
if (recSym == null) |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1329 |
return null; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1330 |
Symbol resolvedReturnType = |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1331 |
analyzeCandidateMethods(recSym, syms.errSymbol, returnSymbolAnalyzer); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1332 |
if (resolvedReturnType == null) |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1333 |
return null; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1334 |
site = resolvedReturnType.type; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1335 |
} else { |
24895
dd091d389fbf
8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents:
24649
diff
changeset
|
1336 |
site = attribSpeculative(rec, env, attr.unknownTypeExprInfo, annotate.noCreator).type; |
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1337 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1338 |
} else { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1339 |
site = env.enclClass.sym.type; |
18901
8309dd8e14d9
8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents:
18646
diff
changeset
|
1340 |
} |
8309dd8e14d9
8019480: Javac crashes when method is called on a type-variable receiver from lambda expression
mcimadamore
parents:
18646
diff
changeset
|
1341 |
|
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
1342 |
List<Type> args = rs.dummyArgs(tree.args.length()); |
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1343 |
Name name = TreeInfo.name(tree.meth); |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1344 |
|
18910
c967bfda9283
8016175: Add bottom-up type-checking support for unambiguous method references
mcimadamore
parents:
18902
diff
changeset
|
1345 |
Resolve.LookupHelper lh = rs.new LookupHelper(name, site, args, List.<Type>nil(), MethodResolutionPhase.VARARITY) { |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1346 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1347 |
Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1348 |
return rec == null ? |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1349 |
rs.findFun(env, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired()) : |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1350 |
rs.findMethod(env, site, name, argtypes, typeargtypes, phase.isBoxingRequired(), phase.isVarargsRequired(), false); |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1351 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1352 |
@Override |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1353 |
Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) { |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1354 |
return sym; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1355 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1356 |
}; |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1357 |
|
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1358 |
return rs.lookupMethod(env, tree, site.tsym, rs.arityMethodCheck, lh); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1359 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1360 |
//where: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1361 |
MethodAnalyzer<Symbol> returnSymbolAnalyzer = new MethodAnalyzer<Symbol>() { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1362 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1363 |
public Symbol process(MethodSymbol ms) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1364 |
ArgumentExpressionKind kind = ArgumentExpressionKind.methodKind(ms, types); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1365 |
return kind != ArgumentExpressionKind.POLY ? ms.getReturnType().tsym : null; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1366 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1367 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1368 |
public Symbol reduce(Symbol s1, Symbol s2) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1369 |
return s1 == syms.errSymbol ? s2 : s1 == s2 ? s1 : null; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1370 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1371 |
@Override |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1372 |
public boolean shouldStop(Symbol result) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1373 |
return result == null; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1374 |
} |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1375 |
}; |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1376 |
|
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1377 |
/** |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1378 |
* Process the result of Resolve.lookupMethod. If sym is a method symbol, the result of |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1379 |
* MethodAnalyzer.process is returned. If sym is an ambiguous symbol, all the candidate |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1380 |
* methods are inspected one by one, using MethodAnalyzer.process. The outcomes are |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1381 |
* reduced using MethodAnalyzer.reduce (using defaultValue as the first value over which |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1382 |
* the reduction runs). MethodAnalyzer.shouldStop can be used to stop the inspection early. |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1383 |
*/ |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1384 |
<E> E analyzeCandidateMethods(Symbol sym, E defaultValue, MethodAnalyzer<E> analyzer) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1385 |
switch (sym.kind) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1386 |
case Kinds.MTH: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1387 |
return analyzer.process((MethodSymbol) sym); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1388 |
case Kinds.AMBIGUOUS: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1389 |
Resolve.AmbiguityError err = (Resolve.AmbiguityError)sym.baseSymbol(); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1390 |
E res = defaultValue; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1391 |
for (Symbol s : err.ambiguousSyms) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1392 |
if (s.kind == Kinds.MTH) { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1393 |
res = analyzer.reduce(res, analyzer.process((MethodSymbol) s)); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1394 |
if (analyzer.shouldStop(res)) |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1395 |
return res; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1396 |
} |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1397 |
} |
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1398 |
return res; |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1399 |
default: |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1400 |
return defaultValue; |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1401 |
} |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1402 |
} |
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1403 |
} |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1404 |
|
24649
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1405 |
/** Analyzer for methods - used by analyzeCandidateMethods. */ |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1406 |
interface MethodAnalyzer<E> { |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1407 |
E process(MethodSymbol ms); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1408 |
E reduce(E e1, E e2); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1409 |
boolean shouldStop(E result); |
1760d92bc6d2
8031967: For some sources compiler compiles for ever
jlahoda
parents:
24396
diff
changeset
|
1410 |
} |
16975
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1411 |
|
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1412 |
//where |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1413 |
private EnumSet<JCTree.Tag> deferredCheckerTags = |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1414 |
EnumSet.of(LAMBDA, REFERENCE, PARENS, TYPECAST, |
124c8436d59c
8010923: Avoid redundant speculative attribution
mcimadamore
parents:
16805
diff
changeset
|
1415 |
CONDEXPR, NEWCLASS, APPLY, LITERAL); |
14057
b4b0377b8dba
7177387: Add target-typing support in method context
mcimadamore
parents:
diff
changeset
|
1416 |
} |