author | mcimadamore |
Wed, 28 Mar 2018 14:24:17 +0100 | |
changeset 49437 | 9925be430918 |
parent 49294 | 3556298e481d |
child 52377 | 907fdbbdf584 |
permissions | -rw-r--r-- |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
1 |
/* |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
4 |
* |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
10 |
* |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
15 |
* accompanied this code). |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
16 |
* |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
20 |
* |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
23 |
* questions. |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
24 |
*/ |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
25 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
26 |
import java.io.File; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
27 |
import java.io.IOException; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
28 |
import java.util.Arrays; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
29 |
import java.util.HashMap; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
30 |
import java.util.Locale; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
31 |
import java.util.Map; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
32 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
33 |
import javax.lang.model.element.Element; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
34 |
import javax.lang.model.element.ElementKind; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
35 |
import javax.lang.model.type.TypeMirror; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
36 |
import javax.tools.JavaCompiler; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
37 |
import javax.tools.JavaFileObject; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
38 |
import javax.tools.StandardJavaFileManager; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
39 |
import javax.tools.ToolProvider; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
40 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
41 |
import com.sun.source.tree.CompilationUnitTree; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
42 |
import com.sun.source.tree.Tree; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
43 |
import com.sun.source.tree.VariableTree; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
44 |
import com.sun.source.util.JavacTask; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
45 |
import com.sun.source.util.TreePathScanner; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
46 |
import com.sun.tools.javac.api.JavacTaskImpl; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
47 |
import com.sun.tools.javac.api.JavacTrees; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
48 |
import com.sun.tools.javac.code.Printer; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
49 |
import com.sun.tools.javac.code.Type; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
50 |
import com.sun.tools.javac.code.Type.CapturedType; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
51 |
import com.sun.tools.javac.code.Type.ClassType; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
52 |
import com.sun.tools.javac.code.Types; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
53 |
import com.sun.tools.javac.util.Log; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
54 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
55 |
import static javax.tools.StandardLocation.SOURCE_PATH; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
56 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
57 |
public class LocalVariableInferenceTester { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
58 |
|
49437
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
59 |
static final StandardJavaFileManager fm; |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
60 |
|
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
61 |
static { |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
62 |
final JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
63 |
fm = comp.getStandardFileManager(null, null, null); |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
64 |
File destDir = new File(System.getProperty("user.dir")); |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
65 |
try { |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
66 |
fm.setLocation(javax.tools.StandardLocation.CLASS_OUTPUT, Arrays.asList(destDir)); |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
67 |
} catch (IOException ex) { |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
68 |
throw new AssertionError(ex); |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
69 |
} |
9925be430918
8200355: local variable inference regression test generates classfile in test folder
mcimadamore
parents:
49294
diff
changeset
|
70 |
} |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
71 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
72 |
public static void main(String[] args) throws IOException { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
73 |
try { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
74 |
if (args.length != 1) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
75 |
System.err.println("Usage: LocalVariableInferenceTester <sourcefile>"); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
76 |
System.exit(1); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
77 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
78 |
File path = new File(System.getProperty("test.src")); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
79 |
fm.setLocation(SOURCE_PATH, Arrays.asList(path)); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
80 |
File input = new File(path, args[0]); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
81 |
JavaFileObject jfo = fm.getJavaFileObjects(input).iterator().next(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
82 |
new LocalVariableInferenceTester().compileAndCheck(jfo); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
83 |
} finally { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
84 |
fm.close(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
85 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
86 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
87 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
88 |
int errors = 0; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
89 |
int checks = 0; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
90 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
91 |
void compileAndCheck(JavaFileObject input) throws IOException { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
92 |
JavaCompiler c = ToolProvider.getSystemJavaCompiler(); |
49294
3556298e481d
8199910: Compiler crashes with -g option and variables of intersection type inferred by `var`
mcimadamore
parents:
47268
diff
changeset
|
93 |
JavacTask task = (JavacTask) c.getTask(null, fm, null, Arrays.asList("-g"), null, Arrays.asList(input)); |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
94 |
JavacTrees trees = JavacTrees.instance(task); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
95 |
Types types = Types.instance(((JavacTaskImpl)task).getContext()); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
96 |
Iterable<? extends CompilationUnitTree> roots = task.parse(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
97 |
Log log = Log.instance(((JavacTaskImpl)task).getContext()); |
49294
3556298e481d
8199910: Compiler crashes with -g option and variables of intersection type inferred by `var`
mcimadamore
parents:
47268
diff
changeset
|
98 |
//force code generation (to shake out non-denotable issues) |
3556298e481d
8199910: Compiler crashes with -g option and variables of intersection type inferred by `var`
mcimadamore
parents:
47268
diff
changeset
|
99 |
boolean hasClasses = task.generate().iterator().hasNext(); |
3556298e481d
8199910: Compiler crashes with -g option and variables of intersection type inferred by `var`
mcimadamore
parents:
47268
diff
changeset
|
100 |
if (!hasClasses) { |
3556298e481d
8199910: Compiler crashes with -g option and variables of intersection type inferred by `var`
mcimadamore
parents:
47268
diff
changeset
|
101 |
throw new AssertionError("Errors occurred during compilation!"); |
3556298e481d
8199910: Compiler crashes with -g option and variables of intersection type inferred by `var`
mcimadamore
parents:
47268
diff
changeset
|
102 |
} |
47268
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
103 |
errors += log.nerrors; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
104 |
new LocalVarTypeChecker(trees, types).scan(roots, null); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
105 |
System.err.println("Checks executed: " + checks); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
106 |
if (errors != 0) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
107 |
throw new AssertionError("Errors were found"); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
108 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
109 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
110 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
111 |
void error(Tree node, String msg) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
112 |
System.err.println(node); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
113 |
System.err.println("ERROR: " + msg); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
114 |
errors++; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
115 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
116 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
117 |
class LocalVarTypeChecker extends TreePathScanner<Void, Void> { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
118 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
119 |
JavacTrees trees; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
120 |
Types types; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
121 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
122 |
LocalVarTypeChecker(JavacTrees trees, Types types) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
123 |
this.trees = trees; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
124 |
this.types = types; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
125 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
126 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
127 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
128 |
public Void visitVariable(VariableTree node, Void aVoid) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
129 |
Element e = trees.getElement(getCurrentPath()); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
130 |
if (e.getKind() == ElementKind.LOCAL_VARIABLE) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
131 |
TypeMirror type = e.asType(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
132 |
InferredType inferredAnno = e.getAnnotation(InferredType.class); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
133 |
if (inferredAnno != null) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
134 |
checks++; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
135 |
String req = inferredAnno.value(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
136 |
String found = new TypePrinter().visit((Type)type, null); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
137 |
if (!req.equals(found)) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
138 |
error(node, "Inferred type mismatch; expected: " + req + " - found: " + found); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
139 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
140 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
141 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
142 |
return super.visitVariable(node, null); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
143 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
144 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
145 |
class TypePrinter extends Printer { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
146 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
147 |
Map<Type, Integer> capturedIdMap = new HashMap<>(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
148 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
149 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
150 |
protected String localize(Locale locale, String key, Object... args) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
151 |
throw new UnsupportedOperationException(); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
152 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
153 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
154 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
155 |
public String visitCapturedType(CapturedType t, Locale locale) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
156 |
return "CAP#" + capturedVarId(t, locale); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
157 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
158 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
159 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
160 |
protected String capturedVarId(CapturedType t, Locale locale) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
161 |
return String.valueOf(capturedIdMap.getOrDefault(t, capturedIdMap.size())); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
162 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
163 |
|
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
164 |
@Override |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
165 |
public String visitClassType(ClassType t, Locale locale) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
166 |
if (!t.isCompound() && t.tsym.name.isEmpty()) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
167 |
return "#ANON(" + types.directSupertypes(t) + ")"; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
168 |
} else if (t.isCompound()) { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
169 |
return "#INT(" + types.directSupertypes(t) + ")"; |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
170 |
} else { |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
171 |
return super.visitClassType(t, locale); |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
172 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
173 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
174 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
175 |
} |
48ec75306997
8177466: Add compiler support for local variable type-inference
mcimadamore
parents:
diff
changeset
|
176 |
} |