author | mcimadamore |
Thu, 05 Oct 2017 12:19:23 +0100 | |
changeset 47315 | 31f541df4187 |
parent 47216 | 71c04702a3d5 |
child 54493 | 17b1c2c467ad |
permissions | -rw-r--r-- |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
1 |
/* |
44187
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
2 |
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
4 |
* |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
10 |
* |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
15 |
* accompanied this code). |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
16 |
* |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
20 |
* |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
23 |
* questions. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
24 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
25 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
26 |
package com.sun.tools.javac.comp; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
27 |
|
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
28 |
import java.util.Collections; |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
29 |
import java.util.EnumSet; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
30 |
import java.util.HashMap; |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
31 |
import java.util.HashSet; |
34761
6400aa5e70e6
8076031: javac should use deterministic data structures for managing free type listeners
vromero
parents:
33917
diff
changeset
|
32 |
import java.util.LinkedHashMap; |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
33 |
import java.util.Map; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
34 |
import java.util.Set; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
35 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
36 |
import com.sun.tools.javac.code.Type; |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
37 |
import com.sun.tools.javac.code.Type.ArrayType; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
38 |
import com.sun.tools.javac.code.Type.ClassType; |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
39 |
import com.sun.tools.javac.code.Type.TypeVar; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
40 |
import com.sun.tools.javac.code.Type.UndetVar; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
41 |
import com.sun.tools.javac.code.Type.UndetVar.InferenceBound; |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
42 |
import com.sun.tools.javac.code.Type.WildcardType; |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
43 |
import com.sun.tools.javac.code.TypeTag; |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
44 |
import com.sun.tools.javac.code.Types; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
45 |
import com.sun.tools.javac.comp.Infer.FreeTypeListener; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
46 |
import com.sun.tools.javac.comp.Infer.GraphSolver; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
47 |
import com.sun.tools.javac.comp.Infer.GraphStrategy; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
48 |
import com.sun.tools.javac.comp.Infer.InferenceException; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
49 |
import com.sun.tools.javac.comp.Infer.InferenceStep; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
50 |
import com.sun.tools.javac.tree.JCTree; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
51 |
import com.sun.tools.javac.util.Assert; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
52 |
import com.sun.tools.javac.util.Filter; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
53 |
import com.sun.tools.javac.util.List; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
54 |
import com.sun.tools.javac.util.ListBuffer; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
55 |
import com.sun.tools.javac.util.Warner; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
56 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
57 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
58 |
* An inference context keeps track of the set of variables that are free |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
59 |
* in the current context. It provides utility methods for opening/closing |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
60 |
* types to their corresponding free/closed forms. It also provide hooks for |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
61 |
* attaching deferred post-inference action (see PendingCheck). Finally, |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
62 |
* it can be used as an entry point for performing upper/lower bound inference |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
63 |
* (see InferenceKind). |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
64 |
* |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
65 |
* <p><b>This is NOT part of any supported API. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
66 |
* If you write code that depends on this, you do so at your own risk. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
67 |
* This code and its internal interfaces are subject to change or |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
68 |
* deletion without notice.</b> |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
69 |
*/ |
39363
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
70 |
public class InferenceContext { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
71 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
72 |
/** list of inference vars as undet vars */ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
73 |
List<Type> undetvars; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
74 |
|
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
75 |
Type update(Type t) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
76 |
return t; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
77 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
78 |
|
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
79 |
/** list of inference vars in this context */ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
80 |
List<Type> inferencevars; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
81 |
|
34761
6400aa5e70e6
8076031: javac should use deterministic data structures for managing free type listeners
vromero
parents:
33917
diff
changeset
|
82 |
Map<FreeTypeListener, List<Type>> freeTypeListeners = new LinkedHashMap<>(); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
83 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
84 |
Types types; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
85 |
Infer infer; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
86 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
87 |
public InferenceContext(Infer infer, List<Type> inferencevars) { |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
88 |
this(infer, inferencevars, inferencevars.map(infer.fromTypeVarFun)); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
89 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
90 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
91 |
public InferenceContext(Infer infer, List<Type> inferencevars, List<Type> undetvars) { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
92 |
this.inferencevars = inferencevars; |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
93 |
this.undetvars = undetvars; |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
94 |
this.infer = infer; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
95 |
this.types = infer.types; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
96 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
97 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
98 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
99 |
* add a new inference var to this inference context |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
100 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
101 |
void addVar(TypeVar t) { |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
102 |
this.undetvars = this.undetvars.prepend(infer.fromTypeVarFun.apply(t)); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
103 |
this.inferencevars = this.inferencevars.prepend(t); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
104 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
105 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
106 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
107 |
* returns the list of free variables (as type-variables) in this |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
108 |
* inference context |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
109 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
110 |
List<Type> inferenceVars() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
111 |
return inferencevars; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
112 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
113 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
114 |
/** |
39363
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
115 |
* returns the list of undetermined variables in this inference context |
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
116 |
*/ |
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
117 |
public List<Type> undetVars() { |
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
118 |
return undetvars; |
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
119 |
} |
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
120 |
|
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
121 |
/** |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
122 |
* returns the list of uninstantiated variables (as type-variables) in this |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
123 |
* inference context |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
124 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
125 |
List<Type> restvars() { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
39363
diff
changeset
|
126 |
return filterVars(uv -> uv.getInst() == null); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
127 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
128 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
129 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
130 |
* returns the list of instantiated variables (as type-variables) in this |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
131 |
* inference context |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
132 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
133 |
List<Type> instvars() { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
39363
diff
changeset
|
134 |
return filterVars(uv -> uv.getInst() != null); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
135 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
136 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
137 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
138 |
* Get list of bounded inference variables (where bound is other than |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
139 |
* declared bounds). |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
140 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
141 |
final List<Type> boundedVars() { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
39363
diff
changeset
|
142 |
return filterVars(uv -> uv.getBounds(InferenceBound.UPPER) |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
39363
diff
changeset
|
143 |
.diff(uv.getDeclaredBounds()) |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
39363
diff
changeset
|
144 |
.appendList(uv.getBounds(InferenceBound.EQ, InferenceBound.LOWER)).nonEmpty()); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
145 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
146 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
147 |
/* Returns the corresponding inference variables. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
148 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
149 |
private List<Type> filterVars(Filter<UndetVar> fu) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
150 |
ListBuffer<Type> res = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
151 |
for (Type t : undetvars) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
152 |
UndetVar uv = (UndetVar)t; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
153 |
if (fu.accepts(uv)) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
154 |
res.append(uv.qtype); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
155 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
156 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
157 |
return res.toList(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
158 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
159 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
160 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
161 |
* is this type free? |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
162 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
163 |
final boolean free(Type t) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
164 |
return t.containsAny(inferencevars); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
165 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
166 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
167 |
final boolean free(List<Type> ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
168 |
for (Type t : ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
169 |
if (free(t)) return true; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
170 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
171 |
return false; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
172 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
173 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
174 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
175 |
* Returns a list of free variables in a given type |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
176 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
177 |
final List<Type> freeVarsIn(Type t) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
178 |
ListBuffer<Type> buf = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
179 |
for (Type iv : inferenceVars()) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
180 |
if (t.contains(iv)) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
181 |
buf.add(iv); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
182 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
183 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
184 |
return buf.toList(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
185 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
186 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
187 |
final List<Type> freeVarsIn(List<Type> ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
188 |
ListBuffer<Type> buf = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
189 |
for (Type t : ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
190 |
buf.appendList(freeVarsIn(t)); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
191 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
192 |
ListBuffer<Type> buf2 = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
193 |
for (Type t : buf) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
194 |
if (!buf2.contains(t)) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
195 |
buf2.add(t); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
196 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
197 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
198 |
return buf2.toList(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
199 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
200 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
201 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
202 |
* Replace all free variables in a given type with corresponding |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
203 |
* undet vars (used ahead of subtyping/compatibility checks to allow propagation |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
204 |
* of inference constraints). |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
205 |
*/ |
39363
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
206 |
public final Type asUndetVar(Type t) { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
207 |
return types.subst(t, inferencevars, undetvars); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
208 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
209 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
210 |
final List<Type> asUndetVars(List<Type> ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
211 |
ListBuffer<Type> buf = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
212 |
for (Type t : ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
213 |
buf.append(asUndetVar(t)); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
214 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
215 |
return buf.toList(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
216 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
217 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
218 |
List<Type> instTypes() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
219 |
ListBuffer<Type> buf = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
220 |
for (Type t : undetvars) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
221 |
UndetVar uv = (UndetVar)t; |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
222 |
buf.append(uv.getInst() != null ? uv.getInst() : uv.qtype); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
223 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
224 |
return buf.toList(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
225 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
226 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
227 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
228 |
* Replace all free variables in a given type with corresponding |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
229 |
* instantiated types - if one or more free variable has not been |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
230 |
* fully instantiated, it will still be available in the resulting type. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
231 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
232 |
Type asInstType(Type t) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
233 |
return types.subst(t, inferencevars, instTypes()); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
234 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
235 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
236 |
List<Type> asInstTypes(List<Type> ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
237 |
ListBuffer<Type> buf = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
238 |
for (Type t : ts) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
239 |
buf.append(asInstType(t)); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
240 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
241 |
return buf.toList(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
242 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
243 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
244 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
245 |
* Add custom hook for performing post-inference action |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
246 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
247 |
void addFreeTypeListener(List<Type> types, FreeTypeListener ftl) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
248 |
freeTypeListeners.put(ftl, freeVarsIn(types)); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
249 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
250 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
251 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
252 |
* Mark the inference context as complete and trigger evaluation |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
253 |
* of all deferred checks. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
254 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
255 |
void notifyChange() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
256 |
notifyChange(inferencevars.diff(restvars())); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
257 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
258 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
259 |
void notifyChange(List<Type> inferredVars) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
260 |
InferenceException thrownEx = null; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
261 |
for (Map.Entry<FreeTypeListener, List<Type>> entry : |
34761
6400aa5e70e6
8076031: javac should use deterministic data structures for managing free type listeners
vromero
parents:
33917
diff
changeset
|
262 |
new LinkedHashMap<>(freeTypeListeners).entrySet()) { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
263 |
if (!Type.containsAny(entry.getValue(), inferencevars.diff(inferredVars))) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
264 |
try { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
265 |
entry.getKey().typesInferred(this); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
266 |
freeTypeListeners.remove(entry.getKey()); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
267 |
} catch (InferenceException ex) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
268 |
if (thrownEx == null) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
269 |
thrownEx = ex; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
270 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
271 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
272 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
273 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
274 |
//inference exception multiplexing - present any inference exception |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
275 |
//thrown when processing listeners as a single one |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
276 |
if (thrownEx != null) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
277 |
throw thrownEx; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
278 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
279 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
280 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
281 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
282 |
* Save the state of this inference context |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
283 |
*/ |
39363
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
284 |
public List<Type> save() { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
285 |
ListBuffer<Type> buf = new ListBuffer<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
286 |
for (Type t : undetvars) { |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
287 |
buf.add(((UndetVar)t).dup(infer.types)); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
288 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
289 |
return buf.toList(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
290 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
291 |
|
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
292 |
/** Restore the state of this inference context to the previous known checkpoint. |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
293 |
* Consider that the number of saved undetermined variables can be different to the current |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
294 |
* amount. This is because new captured variables could have been added. |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
295 |
*/ |
39363
ebaee646b121
8159970: javac, JLS8 18.2.4 is not completely implemented by the compiler
vromero
parents:
38516
diff
changeset
|
296 |
public void rollback(List<Type> saved_undet) { |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
297 |
Assert.check(saved_undet != null); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
298 |
//restore bounds (note: we need to preserve the old instances) |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
299 |
ListBuffer<Type> newUndetVars = new ListBuffer<>(); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
300 |
ListBuffer<Type> newInferenceVars = new ListBuffer<>(); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
301 |
while (saved_undet.nonEmpty() && undetvars.nonEmpty()) { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
302 |
UndetVar uv = (UndetVar)undetvars.head; |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
303 |
UndetVar uv_saved = (UndetVar)saved_undet.head; |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
304 |
if (uv.qtype == uv_saved.qtype) { |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
305 |
uv_saved.dupTo(uv, types); |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
306 |
undetvars = undetvars.tail; |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
307 |
saved_undet = saved_undet.tail; |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
308 |
newUndetVars.add(uv); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
309 |
newInferenceVars.add(uv.qtype); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
310 |
} else { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
311 |
undetvars = undetvars.tail; |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
312 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
313 |
} |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
314 |
undetvars = newUndetVars.toList(); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
315 |
inferencevars = newInferenceVars.toList(); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
316 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
317 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
318 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
319 |
* Copy variable in this inference context to the given context |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
320 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
321 |
void dupTo(final InferenceContext that) { |
32709
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
322 |
dupTo(that, false); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
323 |
} |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
324 |
|
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
325 |
void dupTo(final InferenceContext that, boolean clone) { |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
326 |
that.inferencevars = that.inferencevars.appendList(inferencevars.diff(that.inferencevars)); |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
327 |
List<Type> undetsToPropagate = clone ? save() : undetvars; |
55d136799f79
8078093: Severe compiler performance regression Java 7 to 8 for nested method invocations
mcimadamore
parents:
31937
diff
changeset
|
328 |
that.undetvars = that.undetvars.appendList(undetsToPropagate.diff(that.undetvars)); //propagate cloned undet!! |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
329 |
//set up listeners to notify original inference contexts as |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
330 |
//propagated vars are inferred in new context |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
331 |
for (Type t : inferencevars) { |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
39363
diff
changeset
|
332 |
that.freeTypeListeners.put(inferenceContext -> InferenceContext.this.notifyChange(), List.of(t)); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
333 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
334 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
335 |
|
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
336 |
InferenceContext min(List<Type> roots, boolean shouldSolve, Warner warn) { |
44187
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
337 |
if (roots.length() == inferencevars.length()) { |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
338 |
return this; |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
339 |
} |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
340 |
ReachabilityVisitor rv = new ReachabilityVisitor(); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
341 |
rv.scan(roots); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
342 |
if (rv.min.size() == inferencevars.length()) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
343 |
return this; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
344 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
345 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
346 |
List<Type> minVars = List.from(rv.min); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
347 |
List<Type> redundantVars = inferencevars.diff(minVars); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
348 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
349 |
//compute new undet variables (bounds associated to redundant variables are dropped) |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
350 |
ListBuffer<Type> minUndetVars = new ListBuffer<>(); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
351 |
for (Type minVar : minVars) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
352 |
UndetVar uv = (UndetVar)asUndetVar(minVar); |
44187
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
353 |
Assert.check(uv.incorporationActions.isEmpty()); |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
354 |
UndetVar uv2 = uv.dup(types); |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
355 |
for (InferenceBound ib : InferenceBound.values()) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
356 |
List<Type> newBounds = uv.getBounds(ib).stream() |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
357 |
.filter(b -> !redundantVars.contains(b)) |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
358 |
.collect(List.collector()); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
359 |
uv2.setBounds(ib, newBounds); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
360 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
361 |
minUndetVars.add(uv2); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
362 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
363 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
364 |
//compute new minimal inference context |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
365 |
InferenceContext minContext = new InferenceContext(infer, minVars, minUndetVars.toList()); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
366 |
for (Type t : minContext.inferencevars) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
367 |
//add listener that forwards notifications to original context |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
368 |
minContext.addFreeTypeListener(List.of(t), (inferenceContext) -> { |
44187
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
369 |
((UndetVar)asUndetVar(t)).setInst(inferenceContext.asInstType(t)); |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
370 |
infer.doIncorporation(inferenceContext, warn); |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
371 |
solve(List.from(rv.minMap.get(t)), warn); |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
372 |
notifyChange(); |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
373 |
}); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
374 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
375 |
if (shouldSolve) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
376 |
//solve definitively unreachable variables |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
377 |
List<Type> unreachableVars = redundantVars.diff(List.from(rv.equiv)); |
44187
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
378 |
minContext.addFreeTypeListener(minVars, (inferenceContext) -> { |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
379 |
solve(unreachableVars, warn); |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
380 |
notifyChange(); |
c56d85ea6c89
8175235: type inference regression after JDK-8046685
vromero
parents:
42827
diff
changeset
|
381 |
}); |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
382 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
383 |
return minContext; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
384 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
385 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
386 |
class ReachabilityVisitor extends Types.UnaryVisitor<Void> { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
387 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
388 |
Set<Type> equiv = new HashSet<>(); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
389 |
Set<Type> min = new HashSet<>(); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
390 |
Map<Type, Set<Type>> minMap = new HashMap<>(); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
391 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
392 |
void scan(List<Type> roots) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
393 |
roots.stream().forEach(this::visit); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
394 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
395 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
396 |
@Override |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
397 |
public Void visitType(Type t, Void _unused) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
398 |
return null; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
399 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
400 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
401 |
@Override |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
402 |
public Void visitUndetVar(UndetVar t, Void _unused) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
403 |
if (min.add(t.qtype)) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
404 |
Set<Type> deps = minMap.getOrDefault(t.qtype, new HashSet<>(Collections.singleton(t.qtype))); |
36716
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
405 |
for (InferenceBound boundKind : InferenceBound.values()) { |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
406 |
for (Type b : t.getBounds(boundKind)) { |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
407 |
Type undet = asUndetVar(b); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
408 |
if (!undet.hasTag(TypeTag.UNDETVAR)) { |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
409 |
visit(undet); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
410 |
} else if (isEquiv(t, b, boundKind)) { |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
411 |
deps.add(b); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
412 |
equiv.add(b); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
413 |
} else { |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
414 |
visit(undet); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
415 |
} |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
416 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
417 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
418 |
minMap.put(t.qtype, deps); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
419 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
420 |
return null; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
421 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
422 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
423 |
@Override |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
424 |
public Void visitWildcardType(WildcardType t, Void _unused) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
425 |
return visit(t.type); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
426 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
427 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
428 |
@Override |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
429 |
public Void visitTypeVar(TypeVar t, Void aVoid) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
430 |
Type undet = asUndetVar(t); |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
431 |
if (undet.hasTag(TypeTag.UNDETVAR)) { |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
432 |
visitUndetVar((UndetVar)undet, null); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
433 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
434 |
return null; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
435 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
436 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
437 |
@Override |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
438 |
public Void visitArrayType(ArrayType t, Void _unused) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
439 |
return visit(t.elemtype); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
440 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
441 |
|
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
442 |
@Override |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
443 |
public Void visitClassType(ClassType t, Void _unused) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
444 |
visit(t.getEnclosingType()); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
445 |
for (Type targ : t.getTypeArguments()) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
446 |
visit(targ); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
447 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
448 |
return null; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
449 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
450 |
|
36716
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
451 |
boolean isEquiv(UndetVar from, Type t, InferenceBound boundKind) { |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
452 |
UndetVar uv = (UndetVar)asUndetVar(t); |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
453 |
for (InferenceBound ib : InferenceBound.values()) { |
36716
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
454 |
List<Type> b1 = from.getBounds(ib); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
455 |
if (ib == boundKind) { |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
456 |
b1 = b1.diff(List.of(t)); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
457 |
} |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
458 |
List<Type> b2 = uv.getBounds(ib); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
459 |
if (ib == boundKind.complement()) { |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
460 |
b2 = b2.diff(List.of(from.qtype)); |
4e98efed865f
8152411: Regression: inference fails to reject incompatible upper bounds
mcimadamore
parents:
34761
diff
changeset
|
461 |
} |
33906
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
462 |
if (!b1.containsAll(b2) || !b2.containsAll(b1)) { |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
463 |
return false; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
464 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
465 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
466 |
return true; |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
467 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
468 |
} |
91b6bee06dc1
8046685: Uncompilable large expressions involving generics.
mcimadamore
parents:
32709
diff
changeset
|
469 |
|
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
470 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
471 |
* Solve with given graph strategy. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
472 |
*/ |
38516
b643c42e9d25
8156954: javac incorrectly complains of incompatible types
mcimadamore
parents:
36716
diff
changeset
|
473 |
private void solve(GraphStrategy ss, Warner warn) { |
b643c42e9d25
8156954: javac incorrectly complains of incompatible types
mcimadamore
parents:
36716
diff
changeset
|
474 |
GraphSolver s = infer.new GraphSolver(this, warn); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
475 |
s.solve(ss); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
476 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
477 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
478 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
479 |
* Solve all variables in this context. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
480 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
481 |
public void solve(Warner warn) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
482 |
solve(infer.new LeafSolver() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
483 |
public boolean done() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
484 |
return restvars().isEmpty(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
485 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
486 |
}, warn); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
487 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
488 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
489 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
490 |
* Solve all variables in the given list. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
491 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
492 |
public void solve(final List<Type> vars, Warner warn) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
493 |
solve(infer.new BestLeafSolver(vars) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
494 |
public boolean done() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
495 |
return !free(asInstTypes(vars)); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
496 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
497 |
}, warn); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
498 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
499 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
500 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
501 |
* Solve at least one variable in given list. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
502 |
*/ |
38516
b643c42e9d25
8156954: javac incorrectly complains of incompatible types
mcimadamore
parents:
36716
diff
changeset
|
503 |
public void solveAny(List<Type> varsToSolve, Warner warn) { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
504 |
solve(infer.new BestLeafSolver(varsToSolve.intersect(restvars())) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
505 |
public boolean done() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
506 |
return instvars().intersect(varsToSolve).nonEmpty(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
507 |
} |
38516
b643c42e9d25
8156954: javac incorrectly complains of incompatible types
mcimadamore
parents:
36716
diff
changeset
|
508 |
}, warn); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
509 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
510 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
511 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
512 |
* Apply a set of inference steps |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
513 |
*/ |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
514 |
private List<Type> solveBasic(EnumSet<InferenceStep> steps) { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
515 |
return solveBasic(inferencevars, steps); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
516 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
517 |
|
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
518 |
List<Type> solveBasic(List<Type> varsToSolve, EnumSet<InferenceStep> steps) { |
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
519 |
ListBuffer<Type> solvedVars = new ListBuffer<>(); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
520 |
for (Type t : varsToSolve.intersect(restvars())) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
521 |
UndetVar uv = (UndetVar)asUndetVar(t); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
522 |
for (InferenceStep step : steps) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
523 |
if (step.accepts(uv, this)) { |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
524 |
uv.setInst(step.solve(uv, this)); |
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
525 |
solvedVars.add(uv.qtype); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
526 |
break; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
527 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
528 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
529 |
} |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
530 |
return solvedVars.toList(); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
531 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
532 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
533 |
/** |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
534 |
* Instantiate inference variables in legacy mode (JLS 15.12.2.7, 15.12.2.8). |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
535 |
* During overload resolution, instantiation is done by doing a partial |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
536 |
* inference process using eq/lower bound instantiation. During check, |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
537 |
* we also instantiate any remaining vars by repeatedly using eq/upper |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
538 |
* instantiation, until all variables are solved. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
539 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
540 |
public void solveLegacy(boolean partial, Warner warn, EnumSet<InferenceStep> steps) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
541 |
while (true) { |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
542 |
List<Type> solvedVars = solveBasic(steps); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
543 |
if (restvars().isEmpty() || partial) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
544 |
//all variables have been instantiated - exit |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
545 |
break; |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
546 |
} else if (solvedVars.isEmpty()) { |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
547 |
//some variables could not be instantiated because of cycles in |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
548 |
//upper bounds - provide a (possibly recursive) default instantiation |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
549 |
infer.instantiateAsUninferredVars(restvars(), this); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
550 |
break; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
551 |
} else { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
552 |
//some variables have been instantiated - replace newly instantiated |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
553 |
//variables in remaining upper bounds and continue |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
554 |
for (Type t : undetvars) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
555 |
UndetVar uv = (UndetVar)t; |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
556 |
uv.substBounds(solvedVars, asInstTypes(solvedVars), types); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
557 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
558 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
559 |
} |
33917
45d04023e689
8067767: type inference performance regression
mcimadamore
parents:
33906
diff
changeset
|
560 |
infer.doIncorporation(this, warn); |
31937
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
561 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
562 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
563 |
@Override |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
564 |
public String toString() { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
565 |
return "Inference vars: " + inferencevars + '\n' + |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
566 |
"Undet vars: " + undetvars; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
567 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
568 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
569 |
/* Method Types.capture() generates a new type every time it's applied |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
570 |
* to a wildcard parameterized type. This is intended functionality but |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
571 |
* there are some cases when what you need is not to generate a new |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
572 |
* captured type but to check that a previously generated captured type |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
573 |
* is correct. There are cases when caching a captured type for later |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
574 |
* reuse is sound. In general two captures from the same AST are equal. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
575 |
* This is why the tree is used as the key of the map below. This map |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
576 |
* stores a Type per AST. |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
577 |
*/ |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
578 |
Map<JCTree, Type> captureTypeCache = new HashMap<>(); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
579 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
580 |
Type cachedCapture(JCTree tree, Type t, boolean readOnly) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
581 |
Type captured = captureTypeCache.get(tree); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
582 |
if (captured != null) { |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
583 |
return captured; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
584 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
585 |
|
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
586 |
Type result = types.capture(t); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
587 |
if (result != t && !readOnly) { // then t is a wildcard parameterized type |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
588 |
captureTypeCache.put(tree, result); |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
589 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
590 |
return result; |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
591 |
} |
ad43a6639c4a
8132215: class InferenceContext should live in a separate file
vromero
parents:
diff
changeset
|
592 |
} |