author | sadayapalam |
Mon, 14 Nov 2016 19:45:41 +0530 | |
changeset 41999 | dbf796210eff |
parent 41254 | 08f8dbf7741e |
child 42827 | 36468b5fa7f4 |
permissions | -rw-r--r-- |
10 | 1 |
/* |
36526 | 2 |
* Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. |
10 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5520 | 7 |
* published by the Free Software Foundation. Oracle designates this |
10 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5520 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
10 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5520 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
10 | 24 |
*/ |
25 |
||
26 |
package com.sun.tools.javac.code; |
|
27 |
||
36526 | 28 |
import java.util.Collection; |
29 |
import java.util.Collections; |
|
40774
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
30 |
import java.util.EnumSet; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
31 |
import java.util.HashMap; |
36526 | 32 |
import java.util.LinkedHashMap; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
33 |
import java.util.Map; |
10 | 34 |
|
14258 | 35 |
import javax.lang.model.element.ElementVisitor; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
36 |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
24604
diff
changeset
|
37 |
import com.sun.tools.javac.code.Scope.WriteableScope; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
38 |
import com.sun.tools.javac.code.Symbol.ClassSymbol; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
39 |
import com.sun.tools.javac.code.Symbol.Completer; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
40 |
import com.sun.tools.javac.code.Symbol.CompletionFailure; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
41 |
import com.sun.tools.javac.code.Symbol.MethodSymbol; |
36526 | 42 |
import com.sun.tools.javac.code.Symbol.ModuleSymbol; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
43 |
import com.sun.tools.javac.code.Symbol.PackageSymbol; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
44 |
import com.sun.tools.javac.code.Symbol.TypeSymbol; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
45 |
import com.sun.tools.javac.code.Symbol.VarSymbol; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
46 |
import com.sun.tools.javac.code.Type.BottomType; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
47 |
import com.sun.tools.javac.code.Type.ClassType; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
48 |
import com.sun.tools.javac.code.Type.ErrorType; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
49 |
import com.sun.tools.javac.code.Type.JCPrimitiveType; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
50 |
import com.sun.tools.javac.code.Type.JCVoidType; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
51 |
import com.sun.tools.javac.code.Type.MethodType; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
52 |
import com.sun.tools.javac.code.Type.UnknownType; |
36526 | 53 |
import com.sun.tools.javac.comp.Modules; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
54 |
import com.sun.tools.javac.util.Assert; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
55 |
import com.sun.tools.javac.util.Context; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
56 |
import com.sun.tools.javac.util.Convert; |
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
25874
diff
changeset
|
57 |
import com.sun.tools.javac.util.DefinedBy; |
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
25874
diff
changeset
|
58 |
import com.sun.tools.javac.util.DefinedBy.Api; |
36526 | 59 |
import com.sun.tools.javac.util.Iterators; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
60 |
import com.sun.tools.javac.util.JavacMessages; |
14258 | 61 |
import com.sun.tools.javac.util.List; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
62 |
import com.sun.tools.javac.util.Name; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
63 |
import com.sun.tools.javac.util.Names; |
36526 | 64 |
import com.sun.tools.javac.util.Options; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
65 |
|
14258 | 66 |
import static com.sun.tools.javac.code.Flags.*; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26266
diff
changeset
|
67 |
import static com.sun.tools.javac.code.Kinds.Kind.*; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14259
diff
changeset
|
68 |
import static com.sun.tools.javac.code.TypeTag.*; |
10 | 69 |
|
70 |
/** A class that defines all predefined constants and operators |
|
71 |
* as well as special classes such as java.lang.Object, which need |
|
72 |
* to be known to the compiler. All symbols are held in instance |
|
73 |
* fields. This makes it possible to work in multiple concurrent |
|
74 |
* projects, which might use different class files for library classes. |
|
75 |
* |
|
5847
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5520
diff
changeset
|
76 |
* <p><b>This is NOT part of any supported API. |
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5520
diff
changeset
|
77 |
* If you write code that depends on this, you do so at your own risk. |
10 | 78 |
* This code and its internal interfaces are subject to change or |
79 |
* deletion without notice.</b> |
|
80 |
*/ |
|
81 |
public class Symtab { |
|
82 |
/** The context key for the symbol table. */ |
|
22163 | 83 |
protected static final Context.Key<Symtab> symtabKey = new Context.Key<>(); |
10 | 84 |
|
85 |
/** Get the symbol table instance. */ |
|
86 |
public static Symtab instance(Context context) { |
|
87 |
Symtab instance = context.get(symtabKey); |
|
88 |
if (instance == null) |
|
89 |
instance = new Symtab(context); |
|
90 |
return instance; |
|
91 |
} |
|
92 |
||
93 |
/** Builtin types. |
|
94 |
*/ |
|
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
95 |
public final JCPrimitiveType byteType = new JCPrimitiveType(BYTE, null); |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
96 |
public final JCPrimitiveType charType = new JCPrimitiveType(CHAR, null); |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
97 |
public final JCPrimitiveType shortType = new JCPrimitiveType(SHORT, null); |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
98 |
public final JCPrimitiveType intType = new JCPrimitiveType(INT, null); |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
99 |
public final JCPrimitiveType longType = new JCPrimitiveType(LONG, null); |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
100 |
public final JCPrimitiveType floatType = new JCPrimitiveType(FLOAT, null); |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
101 |
public final JCPrimitiveType doubleType = new JCPrimitiveType(DOUBLE, null); |
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
102 |
public final JCPrimitiveType booleanType = new JCPrimitiveType(BOOLEAN, null); |
10 | 103 |
public final Type botType = new BottomType(); |
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
104 |
public final JCVoidType voidType = new JCVoidType(); |
10 | 105 |
|
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
106 |
private final Names names; |
36526 | 107 |
private final JavacMessages messages; |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
108 |
private final Completer initialCompleter; |
36526 | 109 |
private final Completer moduleCompleter; |
110 |
||
111 |
/** A symbol for the unnamed module. |
|
112 |
*/ |
|
113 |
public final ModuleSymbol unnamedModule; |
|
114 |
||
115 |
/** The error module. |
|
116 |
*/ |
|
117 |
public final ModuleSymbol errModule; |
|
118 |
||
119 |
/** A symbol for no module, for use with -source 8 or less |
|
120 |
*/ |
|
121 |
public final ModuleSymbol noModule; |
|
10 | 122 |
|
123 |
/** A symbol for the root package. |
|
124 |
*/ |
|
125 |
public final PackageSymbol rootPackage; |
|
126 |
||
127 |
/** A symbol that stands for a missing symbol. |
|
128 |
*/ |
|
129 |
public final TypeSymbol noSymbol; |
|
130 |
||
131 |
/** The error symbol. |
|
132 |
*/ |
|
133 |
public final ClassSymbol errSymbol; |
|
134 |
||
6594
d43f068fba19
6970584: Flow.java should be more error-friendly
mcimadamore
parents:
6148
diff
changeset
|
135 |
/** The unknown symbol. |
d43f068fba19
6970584: Flow.java should be more error-friendly
mcimadamore
parents:
6148
diff
changeset
|
136 |
*/ |
d43f068fba19
6970584: Flow.java should be more error-friendly
mcimadamore
parents:
6148
diff
changeset
|
137 |
public final ClassSymbol unknownSymbol; |
d43f068fba19
6970584: Flow.java should be more error-friendly
mcimadamore
parents:
6148
diff
changeset
|
138 |
|
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1037
diff
changeset
|
139 |
/** A value for the errType, with a originalType of noType */ |
10 | 140 |
public final Type errType; |
141 |
||
142 |
/** A value for the unknown type. */ |
|
143 |
public final Type unknownType; |
|
144 |
||
145 |
/** The builtin type of all arrays. */ |
|
146 |
public final ClassSymbol arrayClass; |
|
147 |
public final MethodSymbol arrayCloneMethod; |
|
148 |
||
149 |
/** VGJ: The (singleton) type of all bound types. */ |
|
150 |
public final ClassSymbol boundClass; |
|
151 |
||
152 |
/** The builtin type of all methods. */ |
|
153 |
public final ClassSymbol methodClass; |
|
154 |
||
36526 | 155 |
/** A symbol for the java.base module. |
156 |
*/ |
|
157 |
public final ModuleSymbol java_base; |
|
158 |
||
10 | 159 |
/** Predefined types. |
160 |
*/ |
|
161 |
public final Type objectType; |
|
29295
5a367770a074
8073432: Object.getClass() throws stackless NPE, due to C2 intrinsic
mcimadamore
parents:
29294
diff
changeset
|
162 |
public final Type objectsType; |
10 | 163 |
public final Type classType; |
164 |
public final Type classLoaderType; |
|
165 |
public final Type stringType; |
|
166 |
public final Type stringBufferType; |
|
167 |
public final Type stringBuilderType; |
|
168 |
public final Type cloneableType; |
|
169 |
public final Type serializableType; |
|
16300 | 170 |
public final Type serializedLambdaType; |
36995 | 171 |
public final Type varHandleType; |
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
1471
diff
changeset
|
172 |
public final Type methodHandleType; |
14365
20f388573215
8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
14359
diff
changeset
|
173 |
public final Type methodHandleLookupType; |
14046
8ef5d5b19998
7194586: Add back-end support for invokedynamic
mcimadamore
parents:
13844
diff
changeset
|
174 |
public final Type methodTypeType; |
12213
516b112d6c68
7150368: javac should include basic ability to generate native headers
jjg
parents:
9082
diff
changeset
|
175 |
public final Type nativeHeaderType; |
10 | 176 |
public final Type throwableType; |
177 |
public final Type errorType; |
|
9076
45c73da050e9
7027157: Project Coin: javac warnings for AutoCloseable.close throwing InterruptedException
mcimadamore
parents:
8621
diff
changeset
|
178 |
public final Type interruptedExceptionType; |
10 | 179 |
public final Type illegalArgumentExceptionType; |
180 |
public final Type exceptionType; |
|
181 |
public final Type runtimeExceptionType; |
|
182 |
public final Type classNotFoundExceptionType; |
|
183 |
public final Type noClassDefFoundErrorType; |
|
184 |
public final Type noSuchFieldErrorType; |
|
185 |
public final Type assertionErrorType; |
|
186 |
public final Type cloneNotSupportedExceptionType; |
|
187 |
public final Type annotationType; |
|
188 |
public final TypeSymbol enumSym; |
|
189 |
public final Type listType; |
|
190 |
public final Type collectionsType; |
|
191 |
public final Type comparableType; |
|
16333 | 192 |
public final Type comparatorType; |
10 | 193 |
public final Type arraysType; |
194 |
public final Type iterableType; |
|
195 |
public final Type iteratorType; |
|
196 |
public final Type annotationTargetType; |
|
197 |
public final Type overrideType; |
|
198 |
public final Type retentionType; |
|
199 |
public final Type deprecatedType; |
|
200 |
public final Type suppressWarningsType; |
|
29294
376a915b4ff0
8073645: Add lambda-based lazy eval versions of Assert.check methods
mcimadamore
parents:
29051
diff
changeset
|
201 |
public final Type supplierType; |
10 | 202 |
public final Type inheritedType; |
15724 | 203 |
public final Type profileType; |
10 | 204 |
public final Type proprietaryType; |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
205 |
public final Type systemType; |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
206 |
public final Type autoCloseableType; |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
6709
diff
changeset
|
207 |
public final Type trustMeType; |
14365
20f388573215
8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
14359
diff
changeset
|
208 |
public final Type lambdaMetafactory; |
35424 | 209 |
public final Type stringConcatFactory; |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14539
diff
changeset
|
210 |
public final Type repeatableType; |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
12335
diff
changeset
|
211 |
public final Type documentedType; |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
12335
diff
changeset
|
212 |
public final Type elementTypeType; |
15361
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15356
diff
changeset
|
213 |
public final Type functionalInterfaceType; |
10 | 214 |
|
215 |
/** The symbol representing the length field of an array. |
|
216 |
*/ |
|
217 |
public final VarSymbol lengthVar; |
|
218 |
||
219 |
/** The symbol representing the final finalize method on enums */ |
|
220 |
public final MethodSymbol enumFinalFinalize; |
|
221 |
||
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
222 |
/** The symbol representing the close method on TWR AutoCloseable type */ |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
223 |
public final MethodSymbol autoCloseableClose; |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
224 |
|
10 | 225 |
/** The predefined type that belongs to a tag. |
226 |
*/ |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14259
diff
changeset
|
227 |
public final Type[] typeOfTag = new Type[TypeTag.getTypeTagCount()]; |
10 | 228 |
|
36526 | 229 |
/** The name of the class that belongs to a basic type tag. |
10 | 230 |
*/ |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14259
diff
changeset
|
231 |
public final Name[] boxedName = new Name[TypeTag.getTypeTagCount()]; |
10 | 232 |
|
233 |
/** A hashtable containing the encountered top-level and member classes, |
|
234 |
* indexed by flat names. The table does not contain local classes. |
|
235 |
* It should be updated from the outside to reflect classes defined |
|
236 |
* by compiled source files. |
|
237 |
*/ |
|
36526 | 238 |
private final Map<Name, Map<ModuleSymbol,ClassSymbol>> classes = new HashMap<>(); |
10 | 239 |
|
240 |
/** A hashtable containing the encountered packages. |
|
241 |
* the table should be updated from outside to reflect packages defined |
|
242 |
* by compiled source files. |
|
243 |
*/ |
|
36526 | 244 |
private final Map<Name, Map<ModuleSymbol,PackageSymbol>> packages = new HashMap<>(); |
245 |
||
246 |
/** A hashtable giving the encountered modules. |
|
247 |
*/ |
|
248 |
private final Map<Name, ModuleSymbol> modules = new LinkedHashMap<>(); |
|
10 | 249 |
|
250 |
public void initType(Type type, ClassSymbol c) { |
|
251 |
type.tsym = c; |
|
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
252 |
typeOfTag[type.getTag().ordinal()] = type; |
10 | 253 |
} |
254 |
||
255 |
public void initType(Type type, String name) { |
|
256 |
initType( |
|
257 |
type, |
|
258 |
new ClassSymbol( |
|
259 |
PUBLIC, names.fromString(name), type, rootPackage)); |
|
260 |
} |
|
261 |
||
262 |
public void initType(Type type, String name, String bname) { |
|
263 |
initType(type, name); |
|
36526 | 264 |
boxedName[type.getTag().ordinal()] = names.fromString("java.lang." + bname); |
10 | 265 |
} |
266 |
||
267 |
/** The class symbol that owns all predefined symbols. |
|
268 |
*/ |
|
269 |
public final ClassSymbol predefClass; |
|
270 |
||
271 |
/** Enter a class into symbol table. |
|
14259 | 272 |
* @param s The name of the class. |
10 | 273 |
*/ |
274 |
private Type enterClass(String s) { |
|
36526 | 275 |
return enterClass(java_base, names.fromString(s)).type; |
10 | 276 |
} |
277 |
||
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
278 |
public void synthesizeEmptyInterfaceIfMissing(final Type type) { |
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
279 |
final Completer completer = type.tsym.completer; |
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
280 |
type.tsym.completer = new Completer() { |
36526 | 281 |
@Override |
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
282 |
public void complete(Symbol sym) throws CompletionFailure { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
283 |
try { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
284 |
completer.complete(sym); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
285 |
} catch (CompletionFailure e) { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
286 |
sym.flags_field |= (PUBLIC | INTERFACE); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
287 |
((ClassType) sym.type).supertype_field = objectType; |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
288 |
} |
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
289 |
} |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
290 |
|
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
291 |
@Override |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
292 |
public boolean isTerminal() { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
293 |
return completer.isTerminal(); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
294 |
} |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
295 |
}; |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
296 |
} |
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
297 |
|
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
298 |
public void synthesizeBoxTypeIfMissing(final Type type) { |
36526 | 299 |
ClassSymbol sym = enterClass(java_base, boxedName[type.getTag().ordinal()]); |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
300 |
final Completer completer = sym.completer; |
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
301 |
sym.completer = new Completer() { |
36526 | 302 |
@Override |
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
303 |
public void complete(Symbol sym) throws CompletionFailure { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
304 |
try { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
305 |
completer.complete(sym); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
306 |
} catch (CompletionFailure e) { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
307 |
sym.flags_field |= PUBLIC; |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
308 |
((ClassType) sym.type).supertype_field = objectType; |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
309 |
MethodSymbol boxMethod = |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
310 |
new MethodSymbol(PUBLIC | STATIC, names.valueOf, |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
311 |
new MethodType(List.of(type), sym.type, |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
312 |
List.<Type>nil(), methodClass), |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
313 |
sym); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
314 |
sym.members().enter(boxMethod); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
315 |
MethodSymbol unboxMethod = |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
316 |
new MethodSymbol(PUBLIC, |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
317 |
type.tsym.name.append(names.Value), // x.intValue() |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
318 |
new MethodType(List.<Type>nil(), type, |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
319 |
List.<Type>nil(), methodClass), |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
320 |
sym); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
321 |
sym.members().enter(unboxMethod); |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
322 |
} |
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
323 |
} |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
324 |
|
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
325 |
@Override |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
326 |
public boolean isTerminal() { |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
327 |
return completer.isTerminal(); |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
328 |
} |
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
329 |
}; |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
330 |
} |
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
331 |
|
15724 | 332 |
// Enter a synthetic class that is used to mark classes in ct.sym. |
333 |
// This class does not have a class file. |
|
334 |
private Type enterSyntheticAnnotation(String name) { |
|
36526 | 335 |
// for now, leave the module null, to prevent problems from synthesizing the |
336 |
// existence of a class in any specific module, including noModule |
|
337 |
ClassType type = (ClassType)enterClass(java_base, names.fromString(name)).type; |
|
15724 | 338 |
ClassSymbol sym = (ClassSymbol)type.tsym; |
30066
d74c06a92bd8
8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents:
29295
diff
changeset
|
339 |
sym.completer = Completer.NULL_COMPLETER; |
15724 | 340 |
sym.flags_field = PUBLIC|ACYCLIC|ANNOTATION|INTERFACE; |
341 |
sym.erasure_field = type; |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
24604
diff
changeset
|
342 |
sym.members_field = WriteableScope.create(sym); |
15724 | 343 |
type.typarams_field = List.nil(); |
344 |
type.allparams_field = List.nil(); |
|
345 |
type.supertype_field = annotationType; |
|
346 |
type.interfaces_field = List.nil(); |
|
347 |
return type; |
|
348 |
} |
|
349 |
||
10 | 350 |
/** Constructor; enters all predefined identifiers and operators |
351 |
* into symbol table. |
|
352 |
*/ |
|
353 |
protected Symtab(Context context) throws CompletionFailure { |
|
354 |
context.put(symtabKey, this); |
|
355 |
||
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1257
diff
changeset
|
356 |
names = Names.instance(context); |
10 | 357 |
|
358 |
// Create the unknown type |
|
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
18414
diff
changeset
|
359 |
unknownType = new UnknownType(); |
10 | 360 |
|
36526 | 361 |
messages = JavacMessages.instance(context); |
362 |
||
10 | 363 |
rootPackage = new PackageSymbol(names.empty, null); |
36526 | 364 |
|
365 |
// create the basic builtin symbols |
|
366 |
unnamedModule = new ModuleSymbol(names.empty, null) { |
|
40774
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
367 |
{ |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
368 |
directives = List.nil(); |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
369 |
exports = List.nil(); |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
370 |
provides = List.nil(); |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
371 |
uses = List.nil(); |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
372 |
ModuleSymbol java_base = enterModule(names.java_base); |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
373 |
com.sun.tools.javac.code.Directive.RequiresDirective d = |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
374 |
new com.sun.tools.javac.code.Directive.RequiresDirective(java_base, |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
375 |
EnumSet.of(com.sun.tools.javac.code.Directive.RequiresFlag.MANDATED)); |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
376 |
requires = List.of(d); |
bed459be3a01
8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
vromero
parents:
40593
diff
changeset
|
377 |
} |
36526 | 378 |
@Override |
10 | 379 |
public String toString() { |
36526 | 380 |
return messages.getLocalizedString("compiler.misc.unnamed.module"); |
10 | 381 |
} |
382 |
}; |
|
36526 | 383 |
addRootPackageFor(unnamedModule); |
40593
d2edf0695b7e
8161501: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getEnclosedElements() on unnamed module with unnamed package
vromero
parents:
37744
diff
changeset
|
384 |
unnamedModule.enclosedPackages = unnamedModule.enclosedPackages.prepend(unnamedModule.unnamedPackage); |
36526 | 385 |
|
41999
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
386 |
errModule = new ModuleSymbol(names.empty, null) { |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
387 |
{ |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
388 |
directives = List.nil(); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
389 |
exports = List.nil(); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
390 |
provides = List.nil(); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
391 |
uses = List.nil(); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
392 |
ModuleSymbol java_base = enterModule(names.java_base); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
393 |
com.sun.tools.javac.code.Directive.RequiresDirective d = |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
394 |
new com.sun.tools.javac.code.Directive.RequiresDirective(java_base, |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
395 |
EnumSet.of(com.sun.tools.javac.code.Directive.RequiresFlag.MANDATED)); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
396 |
requires = List.of(d); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
397 |
} |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41254
diff
changeset
|
398 |
}; |
36526 | 399 |
addRootPackageFor(errModule); |
400 |
||
401 |
noModule = new ModuleSymbol(names.empty, null) { |
|
402 |
@Override public boolean isNoModule() { |
|
403 |
return true; |
|
404 |
} |
|
405 |
}; |
|
406 |
addRootPackageFor(noModule); |
|
407 |
||
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26266
diff
changeset
|
408 |
noSymbol = new TypeSymbol(NIL, 0, names.empty, Type.noType, rootPackage) { |
36526 | 409 |
@Override @DefinedBy(Api.LANGUAGE_MODEL) |
8621
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
410 |
public <R, P> R accept(ElementVisitor<R, P> v, P p) { |
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
411 |
return v.visitUnknown(this, p); |
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
412 |
} |
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
413 |
}; |
10 | 414 |
|
415 |
// create the error symbols |
|
416 |
errSymbol = new ClassSymbol(PUBLIC|STATIC|ACYCLIC, names.any, null, rootPackage); |
|
8621
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
417 |
errType = new ErrorType(errSymbol, Type.noType); |
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
418 |
|
6594
d43f068fba19
6970584: Flow.java should be more error-friendly
mcimadamore
parents:
6148
diff
changeset
|
419 |
unknownSymbol = new ClassSymbol(PUBLIC|STATIC|ACYCLIC, names.fromString("<any?>"), null, rootPackage); |
8621
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
420 |
unknownSymbol.members_field = new Scope.ErrorScope(unknownSymbol); |
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
421 |
unknownSymbol.type = unknownType; |
10 | 422 |
|
423 |
// initialize builtin types |
|
424 |
initType(byteType, "byte", "Byte"); |
|
425 |
initType(shortType, "short", "Short"); |
|
426 |
initType(charType, "char", "Character"); |
|
427 |
initType(intType, "int", "Integer"); |
|
428 |
initType(longType, "long", "Long"); |
|
429 |
initType(floatType, "float", "Float"); |
|
430 |
initType(doubleType, "double", "Double"); |
|
431 |
initType(booleanType, "boolean", "Boolean"); |
|
432 |
initType(voidType, "void", "Void"); |
|
433 |
initType(botType, "<nulltype>"); |
|
434 |
initType(errType, errSymbol); |
|
6594
d43f068fba19
6970584: Flow.java should be more error-friendly
mcimadamore
parents:
6148
diff
changeset
|
435 |
initType(unknownType, unknownSymbol); |
10 | 436 |
|
437 |
// the builtin class of all arrays |
|
438 |
arrayClass = new ClassSymbol(PUBLIC|ACYCLIC, names.Array, noSymbol); |
|
439 |
||
440 |
// VGJ |
|
441 |
boundClass = new ClassSymbol(PUBLIC|ACYCLIC, names.Bound, noSymbol); |
|
8621
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
442 |
boundClass.members_field = new Scope.ErrorScope(boundClass); |
10 | 443 |
|
444 |
// the builtin class of all methods |
|
445 |
methodClass = new ClassSymbol(PUBLIC|ACYCLIC, names.Method, noSymbol); |
|
8621
ce0bce60cffc
7021183: 269: assertion failure getting enclosing element of an undefined name
jjg
parents:
8242
diff
changeset
|
446 |
methodClass.members_field = new Scope.ErrorScope(boundClass); |
10 | 447 |
|
448 |
// Create class to hold all predefined constants and operations. |
|
449 |
predefClass = new ClassSymbol(PUBLIC|ACYCLIC, names.empty, rootPackage); |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
24604
diff
changeset
|
450 |
WriteableScope scope = WriteableScope.create(predefClass); |
10 | 451 |
predefClass.members_field = scope; |
452 |
||
24604
7f68545b5128
8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
22442
diff
changeset
|
453 |
// Get the initial completer for Symbols from the ClassFinder |
7f68545b5128
8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
22442
diff
changeset
|
454 |
initialCompleter = ClassFinder.instance(context).getCompleter(); |
36526 | 455 |
rootPackage.members_field = WriteableScope.create(rootPackage); |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
456 |
|
10 | 457 |
// Enter symbols for basic types. |
458 |
scope.enter(byteType.tsym); |
|
459 |
scope.enter(shortType.tsym); |
|
460 |
scope.enter(charType.tsym); |
|
461 |
scope.enter(intType.tsym); |
|
462 |
scope.enter(longType.tsym); |
|
463 |
scope.enter(floatType.tsym); |
|
464 |
scope.enter(doubleType.tsym); |
|
465 |
scope.enter(booleanType.tsym); |
|
466 |
scope.enter(errType.tsym); |
|
467 |
||
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1037
diff
changeset
|
468 |
// Enter symbol for the errSymbol |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1037
diff
changeset
|
469 |
scope.enter(errSymbol); |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
1037
diff
changeset
|
470 |
|
36526 | 471 |
Source source = Source.instance(context); |
472 |
Options options = Options.instance(context); |
|
473 |
boolean noModules = options.isSet("noModules"); |
|
474 |
if (source.allowModules() && !noModules) { |
|
475 |
java_base = enterModule(names.java_base); |
|
476 |
//avoid completing java.base during the Symtab initialization |
|
477 |
java_base.completer = Completer.NULL_COMPLETER; |
|
478 |
java_base.visiblePackages = Collections.emptyMap(); |
|
479 |
} else { |
|
480 |
java_base = noModule; |
|
481 |
} |
|
10 | 482 |
|
36526 | 483 |
// Get the initial completer for ModuleSymbols from Modules |
484 |
moduleCompleter = Modules.instance(context).getCompleter(); |
|
485 |
||
486 |
// Enter predefined classes. All are assumed to be in the java.base module. |
|
10 | 487 |
objectType = enterClass("java.lang.Object"); |
29295
5a367770a074
8073432: Object.getClass() throws stackless NPE, due to C2 intrinsic
mcimadamore
parents:
29294
diff
changeset
|
488 |
objectsType = enterClass("java.util.Objects"); |
10 | 489 |
classType = enterClass("java.lang.Class"); |
490 |
stringType = enterClass("java.lang.String"); |
|
491 |
stringBufferType = enterClass("java.lang.StringBuffer"); |
|
492 |
stringBuilderType = enterClass("java.lang.StringBuilder"); |
|
493 |
cloneableType = enterClass("java.lang.Cloneable"); |
|
494 |
throwableType = enterClass("java.lang.Throwable"); |
|
495 |
serializableType = enterClass("java.io.Serializable"); |
|
16300 | 496 |
serializedLambdaType = enterClass("java.lang.invoke.SerializedLambda"); |
36995 | 497 |
varHandleType = enterClass("java.lang.invoke.VarHandle"); |
8241
4161b56e0d20
7017414: before the move of JSR 292 to package java.lang.invoke, javac must recognize the new package
mcimadamore
parents:
8036
diff
changeset
|
498 |
methodHandleType = enterClass("java.lang.invoke.MethodHandle"); |
14365
20f388573215
8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
14359
diff
changeset
|
499 |
methodHandleLookupType = enterClass("java.lang.invoke.MethodHandles$Lookup"); |
14046
8ef5d5b19998
7194586: Add back-end support for invokedynamic
mcimadamore
parents:
13844
diff
changeset
|
500 |
methodTypeType = enterClass("java.lang.invoke.MethodType"); |
10 | 501 |
errorType = enterClass("java.lang.Error"); |
502 |
illegalArgumentExceptionType = enterClass("java.lang.IllegalArgumentException"); |
|
9076
45c73da050e9
7027157: Project Coin: javac warnings for AutoCloseable.close throwing InterruptedException
mcimadamore
parents:
8621
diff
changeset
|
503 |
interruptedExceptionType = enterClass("java.lang.InterruptedException"); |
10 | 504 |
exceptionType = enterClass("java.lang.Exception"); |
505 |
runtimeExceptionType = enterClass("java.lang.RuntimeException"); |
|
506 |
classNotFoundExceptionType = enterClass("java.lang.ClassNotFoundException"); |
|
507 |
noClassDefFoundErrorType = enterClass("java.lang.NoClassDefFoundError"); |
|
508 |
noSuchFieldErrorType = enterClass("java.lang.NoSuchFieldError"); |
|
509 |
assertionErrorType = enterClass("java.lang.AssertionError"); |
|
510 |
cloneNotSupportedExceptionType = enterClass("java.lang.CloneNotSupportedException"); |
|
511 |
annotationType = enterClass("java.lang.annotation.Annotation"); |
|
512 |
classLoaderType = enterClass("java.lang.ClassLoader"); |
|
36526 | 513 |
enumSym = enterClass(java_base, names.java_lang_Enum); |
10 | 514 |
enumFinalFinalize = |
515 |
new MethodSymbol(PROTECTED|FINAL|HYPOTHETICAL, |
|
516 |
names.finalize, |
|
517 |
new MethodType(List.<Type>nil(), voidType, |
|
518 |
List.<Type>nil(), methodClass), |
|
519 |
enumSym); |
|
520 |
listType = enterClass("java.util.List"); |
|
521 |
collectionsType = enterClass("java.util.Collections"); |
|
522 |
comparableType = enterClass("java.lang.Comparable"); |
|
16333 | 523 |
comparatorType = enterClass("java.util.Comparator"); |
10 | 524 |
arraysType = enterClass("java.util.Arrays"); |
25445
603f0c93d5c9
8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents:
25443
diff
changeset
|
525 |
iterableType = enterClass("java.lang.Iterable"); |
10 | 526 |
iteratorType = enterClass("java.util.Iterator"); |
527 |
annotationTargetType = enterClass("java.lang.annotation.Target"); |
|
528 |
overrideType = enterClass("java.lang.Override"); |
|
529 |
retentionType = enterClass("java.lang.annotation.Retention"); |
|
530 |
deprecatedType = enterClass("java.lang.Deprecated"); |
|
531 |
suppressWarningsType = enterClass("java.lang.SuppressWarnings"); |
|
29294
376a915b4ff0
8073645: Add lambda-based lazy eval versions of Assert.check methods
mcimadamore
parents:
29051
diff
changeset
|
532 |
supplierType = enterClass("java.util.function.Supplier"); |
10 | 533 |
inheritedType = enterClass("java.lang.annotation.Inherited"); |
15356
cf312dc54c60
8006119: update javac to follow latest spec for repeatable annotations
jjg
parents:
14539
diff
changeset
|
534 |
repeatableType = enterClass("java.lang.annotation.Repeatable"); |
13689
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
12335
diff
changeset
|
535 |
documentedType = enterClass("java.lang.annotation.Documented"); |
4d519199a6aa
7151010: Add compiler support for repeating annotations
jfranck
parents:
12335
diff
changeset
|
536 |
elementTypeType = enterClass("java.lang.annotation.ElementType"); |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
537 |
systemType = enterClass("java.lang.System"); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
538 |
autoCloseableType = enterClass("java.lang.AutoCloseable"); |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
539 |
autoCloseableClose = new MethodSymbol(PUBLIC, |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
540 |
names.close, |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
541 |
new MethodType(List.<Type>nil(), voidType, |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
542 |
List.of(exceptionType), methodClass), |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
5857
diff
changeset
|
543 |
autoCloseableType.tsym); |
7643
a067a0cda531
6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents:
6709
diff
changeset
|
544 |
trustMeType = enterClass("java.lang.SafeVarargs"); |
14539
507556c4e622
8003412: javac needs to understand java.lang.annotation.Native
jjg
parents:
14365
diff
changeset
|
545 |
nativeHeaderType = enterClass("java.lang.annotation.Native"); |
14365
20f388573215
8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
14359
diff
changeset
|
546 |
lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory"); |
35424 | 547 |
stringConcatFactory = enterClass("java.lang.invoke.StringConcatFactory"); |
15361
01f1828683e6
8005299: Add FunctionalInterface checking to javac
mcimadamore
parents:
15356
diff
changeset
|
548 |
functionalInterfaceType = enterClass("java.lang.FunctionalInterface"); |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
549 |
|
9076
45c73da050e9
7027157: Project Coin: javac warnings for AutoCloseable.close throwing InterruptedException
mcimadamore
parents:
8621
diff
changeset
|
550 |
synthesizeEmptyInterfaceIfMissing(autoCloseableType); |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
551 |
synthesizeEmptyInterfaceIfMissing(cloneableType); |
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
552 |
synthesizeEmptyInterfaceIfMissing(serializableType); |
14365
20f388573215
8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
rfield
parents:
14359
diff
changeset
|
553 |
synthesizeEmptyInterfaceIfMissing(lambdaMetafactory); |
16300 | 554 |
synthesizeEmptyInterfaceIfMissing(serializedLambdaType); |
35424 | 555 |
synthesizeEmptyInterfaceIfMissing(stringConcatFactory); |
1037
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
556 |
synthesizeBoxTypeIfMissing(doubleType); |
c6b315a34dc6
6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents:
10
diff
changeset
|
557 |
synthesizeBoxTypeIfMissing(floatType); |
3555
a6fd77fe81df
6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
mcimadamore
parents:
2723
diff
changeset
|
558 |
synthesizeBoxTypeIfMissing(voidType); |
10 | 559 |
|
5848
c5a4ce47e780
6960407: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5847
diff
changeset
|
560 |
// Enter a synthetic class that is used to mark internal |
10 | 561 |
// proprietary classes in ct.sym. This class does not have a |
562 |
// class file. |
|
15724 | 563 |
proprietaryType = enterSyntheticAnnotation("sun.Proprietary+Annotation"); |
564 |
||
565 |
// Enter a synthetic class that is used to provide profile info for |
|
566 |
// classes in ct.sym. This class does not have a class file. |
|
567 |
profileType = enterSyntheticAnnotation("jdk.Profile+Annotation"); |
|
568 |
MethodSymbol m = new MethodSymbol(PUBLIC | ABSTRACT, names.value, intType, profileType.tsym); |
|
569 |
profileType.tsym.members().enter(m); |
|
10 | 570 |
|
571 |
// Enter a class for arrays. |
|
572 |
// The class implements java.lang.Cloneable and java.io.Serializable. |
|
573 |
// It has a final length field and a clone method. |
|
574 |
ClassType arrayClassType = (ClassType)arrayClass.type; |
|
575 |
arrayClassType.supertype_field = objectType; |
|
576 |
arrayClassType.interfaces_field = List.of(cloneableType, serializableType); |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
24604
diff
changeset
|
577 |
arrayClass.members_field = WriteableScope.create(arrayClass); |
10 | 578 |
lengthVar = new VarSymbol( |
579 |
PUBLIC | FINAL, |
|
580 |
names.length, |
|
581 |
intType, |
|
582 |
arrayClass); |
|
583 |
arrayClass.members().enter(lengthVar); |
|
584 |
arrayCloneMethod = new MethodSymbol( |
|
585 |
PUBLIC, |
|
586 |
names.clone, |
|
587 |
new MethodType(List.<Type>nil(), objectType, |
|
588 |
List.<Type>nil(), methodClass), |
|
589 |
arrayClass); |
|
590 |
arrayClass.members().enter(arrayCloneMethod); |
|
36526 | 591 |
|
592 |
if (java_base != noModule) |
|
593 |
java_base.completer = sym -> moduleCompleter.complete(sym); //bootstrap issues |
|
594 |
||
10 | 595 |
} |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
596 |
|
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
597 |
/** Define a new class given its name and owner. |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
598 |
*/ |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
599 |
public ClassSymbol defineClass(Name name, Symbol owner) { |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
600 |
ClassSymbol c = new ClassSymbol(0, name, owner); |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
601 |
c.completer = initialCompleter; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
602 |
return c; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
603 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
604 |
|
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
605 |
/** Create a new toplevel or member class symbol with given name |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
606 |
* and owner and enter in `classes' unless already there. |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
607 |
*/ |
36526 | 608 |
public ClassSymbol enterClass(ModuleSymbol msym, Name name, TypeSymbol owner) { |
609 |
Assert.checkNonNull(msym); |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
610 |
Name flatname = TypeSymbol.formFlatName(name, owner); |
36526 | 611 |
ClassSymbol c = getClass(msym, flatname); |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
612 |
if (c == null) { |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
613 |
c = defineClass(name, owner); |
36526 | 614 |
doEnterClass(msym, c); |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
615 |
} else if ((c.name != name || c.owner != owner) && owner.kind == TYP && c.owner.kind == PCK) { |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
616 |
// reassign fields of classes that might have been loaded with |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
617 |
// their flat names. |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
618 |
c.owner.members().remove(c); |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
619 |
c.name = name; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
620 |
c.owner = owner; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
621 |
c.fullname = ClassSymbol.formFullName(name, owner); |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
622 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
623 |
return c; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
624 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
625 |
|
36526 | 626 |
public ClassSymbol getClass(ModuleSymbol msym, Name flatName) { |
627 |
Assert.checkNonNull(msym, () -> flatName.toString()); |
|
628 |
return classes.getOrDefault(flatName, Collections.emptyMap()).get(msym); |
|
629 |
} |
|
630 |
||
631 |
public PackageSymbol lookupPackage(ModuleSymbol msym, Name flatName) { |
|
632 |
Assert.checkNonNull(msym); |
|
633 |
||
634 |
if (flatName.isEmpty()) { |
|
635 |
//unnamed packages only from the current module - visiblePackages contains *root* package, not unnamed package! |
|
636 |
return msym.unnamedPackage; |
|
637 |
} |
|
638 |
||
639 |
if (msym == noModule) { |
|
640 |
return enterPackage(msym, flatName); |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
641 |
} |
36526 | 642 |
|
643 |
msym.complete(); |
|
644 |
||
645 |
PackageSymbol pack; |
|
646 |
||
647 |
pack = msym.visiblePackages.get(flatName); |
|
648 |
||
649 |
if (pack != null) |
|
650 |
return pack; |
|
651 |
||
652 |
pack = getPackage(msym, flatName); |
|
653 |
||
654 |
if (pack != null && pack.exists()) |
|
655 |
return pack; |
|
656 |
||
657 |
boolean dependsOnUnnamed = msym.requires != null && |
|
658 |
msym.requires.stream() |
|
659 |
.map(rd -> rd.module) |
|
660 |
.anyMatch(mod -> mod == unnamedModule); |
|
661 |
||
662 |
if (dependsOnUnnamed) { |
|
663 |
//msyms depends on the unnamed module, for which we generally don't know |
|
664 |
//the list of packages it "exports" ahead of time. So try to lookup the package in the |
|
665 |
//current module, and in the unnamed module and see if it exists in one of them |
|
666 |
PackageSymbol unnamedPack = getPackage(unnamedModule, flatName); |
|
667 |
||
668 |
if (unnamedPack != null && unnamedPack.exists()) { |
|
669 |
msym.visiblePackages.put(unnamedPack.fullname, unnamedPack); |
|
670 |
return unnamedPack; |
|
671 |
} |
|
672 |
||
673 |
pack = enterPackage(msym, flatName); |
|
674 |
pack.complete(); |
|
675 |
if (pack.exists()) |
|
676 |
return pack; |
|
677 |
||
678 |
unnamedPack = enterPackage(unnamedModule, flatName); |
|
679 |
unnamedPack.complete(); |
|
680 |
if (unnamedPack.exists()) { |
|
681 |
msym.visiblePackages.put(unnamedPack.fullname, unnamedPack); |
|
682 |
return unnamedPack; |
|
683 |
} |
|
684 |
||
685 |
return pack; |
|
686 |
} |
|
687 |
||
688 |
return enterPackage(msym, flatName); |
|
689 |
} |
|
690 |
||
691 |
private static final Map<ModuleSymbol, ClassSymbol> EMPTY = new HashMap<>(); |
|
692 |
||
693 |
public void removeClass(ModuleSymbol msym, Name flatName) { |
|
694 |
classes.getOrDefault(flatName, EMPTY).remove(msym); |
|
695 |
} |
|
696 |
||
697 |
public Iterable<ClassSymbol> getAllClasses() { |
|
698 |
return () -> Iterators.createCompoundIterator(classes.values(), v -> v.values().iterator()); |
|
699 |
} |
|
700 |
||
701 |
private void doEnterClass(ModuleSymbol msym, ClassSymbol cs) { |
|
702 |
classes.computeIfAbsent(cs.flatname, n -> new HashMap<>()).put(msym, cs); |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
703 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
704 |
|
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
705 |
/** Create a new member or toplevel class symbol with given flat name |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
706 |
* and enter in `classes' unless already there. |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
707 |
*/ |
36526 | 708 |
public ClassSymbol enterClass(ModuleSymbol msym, Name flatname) { |
709 |
Assert.checkNonNull(msym); |
|
710 |
PackageSymbol ps = lookupPackage(msym, Convert.packagePart(flatname)); |
|
711 |
Assert.checkNonNull(ps); |
|
712 |
Assert.checkNonNull(ps.modle); |
|
713 |
ClassSymbol c = getClass(ps.modle, flatname); |
|
714 |
if (c == null) { |
|
715 |
c = defineClass(Convert.shortName(flatname), ps); |
|
716 |
doEnterClass(ps.modle, c); |
|
717 |
return c; |
|
718 |
} else |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
719 |
return c; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
720 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
721 |
|
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
722 |
/** Check to see if a package exists, given its fully qualified name. |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
723 |
*/ |
36526 | 724 |
public boolean packageExists(ModuleSymbol msym, Name fullname) { |
725 |
Assert.checkNonNull(msym); |
|
37744
bf4fd5e022c5
8154283: Check for clash between package and class not working when package in a different module
jlahoda
parents:
36996
diff
changeset
|
726 |
return lookupPackage(msym, fullname).exists(); |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
727 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
728 |
|
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
729 |
/** Make a package, given its fully qualified name. |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
730 |
*/ |
36526 | 731 |
public PackageSymbol enterPackage(ModuleSymbol currModule, Name fullname) { |
732 |
Assert.checkNonNull(currModule); |
|
733 |
PackageSymbol p = getPackage(currModule, fullname); |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
734 |
if (p == null) { |
36526 | 735 |
Assert.check(!fullname.isEmpty(), () -> "rootPackage missing!; currModule: " + currModule); |
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
736 |
p = new PackageSymbol( |
36526 | 737 |
Convert.shortName(fullname), |
738 |
enterPackage(currModule, Convert.packagePart(fullname))); |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
739 |
p.completer = initialCompleter; |
36526 | 740 |
p.modle = currModule; |
741 |
doEnterPackage(currModule, p); |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
742 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
743 |
return p; |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
744 |
} |
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
745 |
|
36526 | 746 |
private void doEnterPackage(ModuleSymbol msym, PackageSymbol pack) { |
747 |
packages.computeIfAbsent(pack.fullname, n -> new HashMap<>()).put(msym, pack); |
|
748 |
msym.enclosedPackages = msym.enclosedPackages.prepend(pack); |
|
749 |
} |
|
750 |
||
751 |
private void addRootPackageFor(ModuleSymbol module) { |
|
752 |
doEnterPackage(module, rootPackage); |
|
753 |
PackageSymbol unnamedPackage = new PackageSymbol(names.empty, rootPackage) { |
|
754 |
@Override |
|
755 |
public String toString() { |
|
756 |
return messages.getLocalizedString("compiler.misc.unnamed.package"); |
|
757 |
} |
|
758 |
}; |
|
759 |
unnamedPackage.modle = module; |
|
760 |
unnamedPackage.completer = sym -> initialCompleter.complete(sym); |
|
761 |
module.unnamedPackage = unnamedPackage; |
|
762 |
} |
|
763 |
||
764 |
public PackageSymbol getPackage(ModuleSymbol module, Name fullname) { |
|
765 |
return packages.getOrDefault(fullname, Collections.emptyMap()).get(module); |
|
766 |
} |
|
767 |
||
768 |
public ModuleSymbol enterModule(Name name) { |
|
769 |
ModuleSymbol msym = modules.get(name); |
|
770 |
if (msym == null) { |
|
771 |
msym = ModuleSymbol.create(name, names.module_info); |
|
772 |
addRootPackageFor(msym); |
|
773 |
msym.completer = sym -> moduleCompleter.complete(sym); //bootstrap issues |
|
774 |
modules.put(name, msym); |
|
775 |
} |
|
776 |
return msym; |
|
777 |
} |
|
778 |
||
779 |
public ModuleSymbol getModule(Name name) { |
|
780 |
return modules.get(name); |
|
781 |
} |
|
782 |
||
783 |
//temporary: |
|
784 |
public ModuleSymbol inferModule(Name packageName) { |
|
785 |
if (packageName.isEmpty()) |
|
786 |
return java_base == noModule ? noModule : unnamedModule;//! |
|
787 |
||
788 |
ModuleSymbol msym = null; |
|
789 |
Map<ModuleSymbol,PackageSymbol> map = packages.get(packageName); |
|
790 |
if (map == null) |
|
791 |
return null; |
|
792 |
for (Map.Entry<ModuleSymbol,PackageSymbol> e: map.entrySet()) { |
|
793 |
if (!e.getValue().members().isEmpty()) { |
|
794 |
if (msym == null) { |
|
795 |
msym = e.getKey(); |
|
796 |
} else { |
|
797 |
return null; |
|
798 |
} |
|
799 |
} |
|
800 |
} |
|
801 |
return msym; |
|
802 |
} |
|
803 |
||
804 |
public List<ModuleSymbol> listPackageModules(Name packageName) { |
|
805 |
if (packageName.isEmpty()) |
|
806 |
return List.nil(); |
|
807 |
||
808 |
List<ModuleSymbol> result = List.nil(); |
|
809 |
Map<ModuleSymbol,PackageSymbol> map = packages.get(packageName); |
|
810 |
if (map != null) { |
|
811 |
for (Map.Entry<ModuleSymbol, PackageSymbol> e: map.entrySet()) { |
|
812 |
if (!e.getValue().members().isEmpty()) { |
|
813 |
result = result.prepend(e.getKey()); |
|
814 |
} |
|
815 |
} |
|
816 |
} |
|
817 |
return result; |
|
818 |
} |
|
819 |
||
820 |
public Collection<ModuleSymbol> getAllModules() { |
|
821 |
return modules.values(); |
|
22442
8fd30fc4e3a3
8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents:
22163
diff
changeset
|
822 |
} |
10 | 823 |
} |