equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
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 |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
36 import com.sun.tools.javac.code.Symtab; |
36 import com.sun.tools.javac.code.Symtab; |
37 import com.sun.tools.javac.code.Type; |
37 import com.sun.tools.javac.code.Type; |
38 import com.sun.tools.javac.code.Type.ClassType; |
38 import com.sun.tools.javac.code.Type.ClassType; |
39 import com.sun.tools.javac.code.TypeTag; |
39 import com.sun.tools.javac.code.TypeTag; |
40 import com.sun.tools.javac.code.Types; |
40 import com.sun.tools.javac.code.Types; |
|
41 import com.sun.tools.javac.comp.Annotate; |
41 import com.sun.tools.javac.comp.Check; |
42 import com.sun.tools.javac.comp.Check; |
42 import com.sun.tools.javac.comp.CompileStates; |
43 import com.sun.tools.javac.comp.CompileStates; |
43 import com.sun.tools.javac.comp.Enter; |
44 import com.sun.tools.javac.comp.Enter; |
44 import com.sun.tools.javac.comp.Modules; |
45 import com.sun.tools.javac.comp.Modules; |
45 import com.sun.tools.javac.main.Arguments; |
46 import com.sun.tools.javac.main.Arguments; |
93 Enter.instance(this).newRound(); |
94 Enter.instance(this).newRound(); |
94 ((ReusableJavaCompiler)ReusableJavaCompiler.instance(this)).clear(); |
95 ((ReusableJavaCompiler)ReusableJavaCompiler.instance(this)).clear(); |
95 Types.instance(this).newRound(); |
96 Types.instance(this).newRound(); |
96 Check.instance(this).newRound(); |
97 Check.instance(this).newRound(); |
97 Modules.instance(this).newRound(); |
98 Modules.instance(this).newRound(); |
|
99 Annotate.instance(this).newRound(); |
98 CompileStates.instance(this).clear(); |
100 CompileStates.instance(this).clear(); |
99 MultiTaskListener.instance(this).clear(); |
101 MultiTaskListener.instance(this).clear(); |
100 |
102 |
101 //find if any of the roots have redefined java.* classes |
103 //find if any of the roots have redefined java.* classes |
102 Symtab syms = Symtab.instance(this); |
104 Symtab syms = Symtab.instance(this); |