langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
author mcimadamore
Thu, 24 Jul 2014 13:11:03 +0100
changeset 25844 48eab270456c
parent 25443 9187d77f2c64
permissions -rw-r--r--
8048890: Add option to keep track of symbol completion dependencies Summary: Generate dot file with representation of javac on-demand symbol completion dependencies Reviewed-by: jjg, jlahoda
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22163
diff changeset
     2
 * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4877
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4877
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4877
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4877
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4877
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
06bc494ca11e Initial load
duke
parents:
diff changeset
    26
package com.sun.tools.javac.comp;
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
    28
import java.util.Collections;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
    29
import java.util.HashSet;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
    30
import java.util.IdentityHashMap;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    31
import java.util.Set;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
    32
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    33
import javax.tools.JavaFileObject;
06bc494ca11e Initial load
duke
parents:
diff changeset
    34
06bc494ca11e Initial load
duke
parents:
diff changeset
    35
import com.sun.tools.javac.code.*;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
    36
import com.sun.tools.javac.code.Scope.ImportFilter;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
    37
import com.sun.tools.javac.code.Scope.NamedImportScope;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
    38
import com.sun.tools.javac.code.Scope.StarImportScope;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
    39
import com.sun.tools.javac.code.Scope.WriteableScope;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    40
import com.sun.tools.javac.jvm.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    41
import com.sun.tools.javac.tree.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
import com.sun.tools.javac.util.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    43
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
    44
import com.sun.tools.javac.code.Symbol.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    45
import com.sun.tools.javac.code.Type.*;
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
    46
import com.sun.tools.javac.code.TypeAnnotationPosition.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    47
import com.sun.tools.javac.tree.JCTree.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    48
06bc494ca11e Initial load
duke
parents:
diff changeset
    49
import static com.sun.tools.javac.code.Flags.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 9082
diff changeset
    50
import static com.sun.tools.javac.code.Flags.ANNOTATION;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    51
import static com.sun.tools.javac.code.Kinds.*;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
    52
import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14259
diff changeset
    53
import static com.sun.tools.javac.code.TypeTag.CLASS;
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14259
diff changeset
    54
import static com.sun.tools.javac.code.TypeTag.ERROR;
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14259
diff changeset
    55
import static com.sun.tools.javac.code.TypeTag.TYPEVAR;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 9082
diff changeset
    56
import static com.sun.tools.javac.tree.JCTree.Tag.*;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24396
diff changeset
    57
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
    58
import com.sun.tools.javac.util.Dependencies.AttributionKind;
11709
0d56d3fc22e6 7129225: javac fails to run annotation processors when star import of package of gensrc
jjh
parents: 10950
diff changeset
    59
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    60
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
06bc494ca11e Initial load
duke
parents:
diff changeset
    61
06bc494ca11e Initial load
duke
parents:
diff changeset
    62
/** This is the second phase of Enter, in which classes are completed
06bc494ca11e Initial load
duke
parents:
diff changeset
    63
 *  by entering their members into the class scope using
06bc494ca11e Initial load
duke
parents:
diff changeset
    64
 *  MemberEnter.complete().  See Enter for an overview.
06bc494ca11e Initial load
duke
parents:
diff changeset
    65
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    66
 *  <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
    67
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    68
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    69
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    70
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    71
public class MemberEnter extends JCTree.Visitor implements Completer {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
    72
    protected static final Context.Key<MemberEnter> memberEnterKey = new Context.Key<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    73
06bc494ca11e Initial load
duke
parents:
diff changeset
    74
    /** A switch to determine whether we check for package/class conflicts
06bc494ca11e Initial load
duke
parents:
diff changeset
    75
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
    final static boolean checkClash = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1045
diff changeset
    78
    private final Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
    private final Enter enter;
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
    private final Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
    private final Check chk;
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
    private final Attr attr;
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
    private final Symtab syms;
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
    private final TreeMaker make;
06bc494ca11e Initial load
duke
parents:
diff changeset
    85
    private final Todo todo;
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
    private final Annotate annotate;
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
    private final Types types;
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
    88
    private final JCDiagnostic.Factory diags;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 12917
diff changeset
    89
    private final Source source;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    90
    private final Target target;
8236
0d8646b7c602 6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents: 8225
diff changeset
    91
    private final DeferredLintHandler deferredLintHandler;
19942
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
    92
    private final Lint lint;
25007
eb097d3a68f5 8038975: Access control in enhanced for
pgovereau
parents: 24903
diff changeset
    93
    private final TypeEnvs typeEnvs;
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
    94
    private final Dependencies dependencies;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    95
06bc494ca11e Initial load
duke
parents:
diff changeset
    96
    public static MemberEnter instance(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
    97
        MemberEnter instance = context.get(memberEnterKey);
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
        if (instance == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
            instance = new MemberEnter(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   100
        return instance;
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
06bc494ca11e Initial load
duke
parents:
diff changeset
   103
    protected MemberEnter(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   104
        context.put(memberEnterKey, this);
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1045
diff changeset
   105
        names = Names.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   106
        enter = Enter.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   107
        log = Log.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   108
        chk = Check.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   109
        attr = Attr.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   110
        syms = Symtab.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   111
        make = TreeMaker.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   112
        todo = Todo.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   113
        annotate = Annotate.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   114
        types = Types.instance(context);
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
   115
        diags = JCDiagnostic.Factory.instance(context);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 12917
diff changeset
   116
        source = Source.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   117
        target = Target.instance(context);
8236
0d8646b7c602 6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents: 8225
diff changeset
   118
        deferredLintHandler = DeferredLintHandler.instance(context);
19942
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   119
        lint = Lint.instance(context);
25007
eb097d3a68f5 8038975: Access control in enhanced for
pgovereau
parents: 24903
diff changeset
   120
        typeEnvs = TypeEnvs.instance(context);
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   121
        dependencies = Dependencies.instance(context);
18643
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 18389
diff changeset
   122
        allowTypeAnnos = source.allowTypeAnnotations();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   123
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   124
18643
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 18389
diff changeset
   125
    /** Switch: support type annotations.
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 18389
diff changeset
   126
     */
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 18389
diff changeset
   127
    boolean allowTypeAnnos;
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 18389
diff changeset
   128
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   129
    /** A queue for classes whose members still need to be entered into the
06bc494ca11e Initial load
duke
parents:
diff changeset
   130
     *  symbol table.
06bc494ca11e Initial load
duke
parents:
diff changeset
   131
     */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
   132
    ListBuffer<Env<AttrContext>> halfcompleted = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   133
06bc494ca11e Initial load
duke
parents:
diff changeset
   134
    /** Set to true only when the first of a set of classes is
18643
fdd7572e0c18 8016613: javac should avoid source 8 only analysis when compiling for source 7
vromero
parents: 18389
diff changeset
   135
     *  processed from the half completed queue.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   136
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   137
    boolean isFirst = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   138
06bc494ca11e Initial load
duke
parents:
diff changeset
   139
    /** A flag to disable completion from time to time during member
06bc494ca11e Initial load
duke
parents:
diff changeset
   140
     *  enter, as we only need to look up types.  This avoids
06bc494ca11e Initial load
duke
parents:
diff changeset
   141
     *  unnecessarily deep recursion.
06bc494ca11e Initial load
duke
parents:
diff changeset
   142
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   143
    boolean completionEnabled = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   144
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   145
    /** The creator that will be used for any varDef's we visit.  This
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   146
     * is used to create the position for any type annotations (or
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   147
     * annotations that potentially are type annotations) that we
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   148
     * encounter.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   149
     */
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   150
    Annotate.PositionCreator creator;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   151
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   152
    /* ---------- Processing import clauses ----------------
06bc494ca11e Initial load
duke
parents:
diff changeset
   153
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   154
06bc494ca11e Initial load
duke
parents:
diff changeset
   155
    /** Import all classes of a class or package on demand.
06bc494ca11e Initial load
duke
parents:
diff changeset
   156
     *  @param pos           Position to be used for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
   157
     *  @param tsym          The class or package the members of which are imported.
14259
fb94a1df0d53 8000208: fix langtools javadoc comment issues
jjg
parents: 14058
diff changeset
   158
     *  @param env           The env in which the imported classes will be entered.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   159
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   160
    private void importAll(int pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
   161
                           final TypeSymbol tsym,
06bc494ca11e Initial load
duke
parents:
diff changeset
   162
                           Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   163
        // Check that packages imported from exist (JLS ???).
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   164
        if (tsym.kind == PCK && tsym.members().isEmpty() && !tsym.exists()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   165
            // If we can't find java.lang, exit immediately.
06bc494ca11e Initial load
duke
parents:
diff changeset
   166
            if (((PackageSymbol)tsym).fullname.equals(names.java_lang)) {
1040
c0f5acfd9d15 6730423: Diagnostic formatter should be an instance field of JCDiagnostic
mcimadamore
parents: 939
diff changeset
   167
                JCDiagnostic msg = diags.fragment("fatal.err.no.java.lang");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   168
                throw new FatalError(msg);
06bc494ca11e Initial load
duke
parents:
diff changeset
   169
            } else {
11709
0d56d3fc22e6 7129225: javac fails to run annotation processors when star import of package of gensrc
jjh
parents: 10950
diff changeset
   170
                log.error(DiagnosticFlag.RESOLVE_ERROR, pos, "doesnt.exist", tsym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   171
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   172
        }
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   173
        env.toplevel.starImportScope.importAll(tsym.members(), tsym.members(), typeImportFilter, false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   174
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   175
06bc494ca11e Initial load
duke
parents:
diff changeset
   176
    /** Import all static members of a class or package on demand.
06bc494ca11e Initial load
duke
parents:
diff changeset
   177
     *  @param pos           Position to be used for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
   178
     *  @param tsym          The class or package the members of which are imported.
14259
fb94a1df0d53 8000208: fix langtools javadoc comment issues
jjg
parents: 14058
diff changeset
   179
     *  @param env           The env in which the imported classes will be entered.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   180
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   181
    private void importStaticAll(int pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
   182
                                 final TypeSymbol tsym,
06bc494ca11e Initial load
duke
parents:
diff changeset
   183
                                 Env<AttrContext> env) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   184
        final StarImportScope toScope = env.toplevel.starImportScope;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   185
        final PackageSymbol packge = env.toplevel.packge;
06bc494ca11e Initial load
duke
parents:
diff changeset
   186
        final TypeSymbol origin = tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   187
06bc494ca11e Initial load
duke
parents:
diff changeset
   188
        // enter imported types immediately
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   189
        new SymbolImporter() {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   190
            void doImport(TypeSymbol tsym) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   191
                toScope.importAll(tsym.members(), origin.members(), staticImportFilter, true);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   192
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   193
        }.importFrom(tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   194
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   195
06bc494ca11e Initial load
duke
parents:
diff changeset
   196
    /** Import statics types of a given name.  Non-types are handled in Attr.
06bc494ca11e Initial load
duke
parents:
diff changeset
   197
     *  @param pos           Position to be used for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
   198
     *  @param tsym          The class from which the name is imported.
06bc494ca11e Initial load
duke
parents:
diff changeset
   199
     *  @param name          The (simple) name being imported.
06bc494ca11e Initial load
duke
parents:
diff changeset
   200
     *  @param env           The environment containing the named import
06bc494ca11e Initial load
duke
parents:
diff changeset
   201
     *                  scope to add to.
06bc494ca11e Initial load
duke
parents:
diff changeset
   202
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   203
    private void importNamedStatic(final DiagnosticPosition pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
   204
                                   final TypeSymbol tsym,
06bc494ca11e Initial load
duke
parents:
diff changeset
   205
                                   final Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
   206
                                   final Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   207
        if (tsym.kind != TYP) {
12917
0c381f0ac967 7159016: Static import of member in processor-generated class fails in JDK 7
jjh
parents: 12916
diff changeset
   208
            log.error(DiagnosticFlag.RECOVERABLE, pos, "static.imp.only.classes.and.interfaces");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   209
            return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   210
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   211
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   212
        final NamedImportScope toScope = env.toplevel.namedImportScope;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   213
        final Scope originMembers = tsym.members();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   214
06bc494ca11e Initial load
duke
parents:
diff changeset
   215
        // enter imported types immediately
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   216
        new SymbolImporter() {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   217
            void doImport(TypeSymbol tsym) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   218
                Set<Symbol> maskedOut = null;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   219
                for (Symbol sym : tsym.members().getSymbolsByName(name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   220
                    if (sym.kind == TYP &&
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   221
                        staticImportFilter.accepts(originMembers, sym) &&
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   222
                        !chk.checkUniqueStaticImport(pos, env.toplevel, sym)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   223
                        if (maskedOut == null)
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   224
                            maskedOut = Collections.newSetFromMap(new IdentityHashMap<Symbol, Boolean>());
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   225
                        maskedOut.add(sym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   226
                    }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   227
                }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   228
                ImportFilter importFilter = maskedOut != null ?
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   229
                        new MaskedImportFilter(staticImportFilter, maskedOut) :
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   230
                        staticImportFilter;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   231
                toScope.importByName(tsym.members(), originMembers, name, importFilter);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   232
            }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   233
        }.importFrom(tsym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   234
    }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   235
    //where:
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   236
        class MaskedImportFilter implements ImportFilter {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   237
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   238
            private final ImportFilter delegate;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   239
            private final Set<Symbol> maskedOut;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   240
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   241
            public MaskedImportFilter(ImportFilter delegate, Set<Symbol> maskedOut) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   242
                this.delegate = delegate;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   243
                this.maskedOut = maskedOut;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   244
            }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   245
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   246
            @Override
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   247
            public boolean accepts(Scope origin, Symbol sym) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   248
                return !maskedOut.contains(sym) && delegate.accepts(origin, sym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   249
            }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   250
        }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   251
        abstract class SymbolImporter {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
   252
            Set<Symbol> processed = new HashSet<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   253
            void importFrom(TypeSymbol tsym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   254
                if (tsym == null || !processed.add(tsym))
06bc494ca11e Initial load
duke
parents:
diff changeset
   255
                    return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   256
06bc494ca11e Initial load
duke
parents:
diff changeset
   257
                // also import inherited names
06bc494ca11e Initial load
duke
parents:
diff changeset
   258
                importFrom(types.supertype(tsym.type).tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   259
                for (Type t : types.interfaces(tsym.type))
06bc494ca11e Initial load
duke
parents:
diff changeset
   260
                    importFrom(t.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   262
                doImport(tsym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
            }
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   264
            abstract void doImport(TypeSymbol tsym);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   265
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   266
06bc494ca11e Initial load
duke
parents:
diff changeset
   267
    /** Import given class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
     *  @param pos           Position to be used for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
     *  @param tsym          The class to be imported.
06bc494ca11e Initial load
duke
parents:
diff changeset
   270
     *  @param env           The environment containing the named import
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
     *                  scope to add to.
06bc494ca11e Initial load
duke
parents:
diff changeset
   272
     */
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   273
    private void importNamed(DiagnosticPosition pos, final Symbol tsym, Env<AttrContext> env) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   274
        if (tsym.kind == TYP &&
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   275
            chk.checkUniqueImport(pos, env.toplevel, tsym))
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   276
            env.toplevel.namedImportScope.importType(tsym.owner.members(), tsym.owner.members(), tsym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   277
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   278
06bc494ca11e Initial load
duke
parents:
diff changeset
   279
    /** Construct method type from method signature.
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   280
     *  @param msym        The MethodSymbol for the method.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
     *  @param typarams    The method's type parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
     *  @param params      The method's value parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
   283
     *  @param res             The method's result type,
06bc494ca11e Initial load
duke
parents:
diff changeset
   284
     *                 null if it is a constructor.
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   285
     *  @param recvparam       The method's receiver parameter,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   286
     *                 null if none given; TODO: or already set here?
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
     *  @param thrown      The method's thrown exceptions.
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
     *  @param env             The method's (local) environment.
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   289
     *  @param declAnnos   The annotations on the method declaration,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   290
     *                     some of which may be type annotations on
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   291
     *                     the return type.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   292
     *  @param deferPos    The deferred diagnostic position for error
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   293
     *                     reporting.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   294
     */
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   295
    Type signature(final MethodSymbol msym,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   296
                   final List<JCTypeParameter> typarams,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   297
                   final List<JCVariableDecl> params,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   298
                   final JCTree res,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   299
                   final JCVariableDecl recvparam,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   300
                   final List<JCExpression> thrown,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   301
                   final Env<AttrContext> env,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   302
                   final List<JCAnnotation> declAnnos,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   303
                   final DiagnosticPosition deferPos) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   304
        int i;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   305
06bc494ca11e Initial load
duke
parents:
diff changeset
   306
        // Enter and attribute type parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
   307
        List<Type> tvars = enter.classEnter(typarams, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   308
        attr.attribTypeVariables(typarams, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   309
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   310
        // Handle type annotations on type parameters.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   311
        i = 0;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   312
        for (List<JCTypeParameter> l = typarams; l.nonEmpty();
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   313
             l = l.tail, i++) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   314
            final JCTypeParameter param = l.head;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   315
            annotate.annotateTypeLater(param, env, msym, deferPos,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   316
                                       annotate.methodTypeParamCreator(i));
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   317
            // ...and bounds on type parameters.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   318
            int j = 0;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   319
            for (List<JCExpression> bounds = param.bounds;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   320
                 bounds.nonEmpty(); bounds = bounds.tail, j++) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   321
                annotate.annotateTypeLater(bounds.head, env, msym, deferPos,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   322
                                           annotate.methodTypeParamBoundCreator(param, i, j));
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   323
            }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   324
        }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   325
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   326
        // Enter and attribute value parameters.  Type annotations get
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   327
        // METHOD_FORMAL_PARAMETER positions.
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
   328
        ListBuffer<Type> argbuf = new ListBuffer<>();
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   329
        i = 0;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   330
        for (List<JCVariableDecl> l = params; l.nonEmpty(); l = l.tail, i++) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   331
            // The types will get annotated by visitVarDef
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   332
            memberEnter(l.head, env, annotate.paramCreator(i));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   333
            argbuf.append(l.head.vartype.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
   334
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
        // Attribute result type, if one is given.
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   337
        Type restype;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   338
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   339
        if (res != null) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   340
            // If we have any declaration annotations, they might
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   341
            // be/also be type annotations on the return type.  We
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   342
            // pass them in, so they get classified and then attached
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   343
            // to the method, or the return type, or both.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   344
            restype = attr.attribType(res, env);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   345
            annotate.annotateTypeLater(res, declAnnos, env, msym, deferPos,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   346
                                       annotate.returnCreator);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   347
        } else {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   348
            // For constructors, we don't actually have a type, so we
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   349
            // can't have a type path (except for INNER_TYPE), and we
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   350
            // don't have annotations on arrays, type arguments, and
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   351
            // the like.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   352
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   353
            // The only type path we have is if we are in an inner type.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   354
            List<TypePathEntry> typepath = Annotate.makeInners(msym.owner.type);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   355
            TypeAnnotationPosition tapos =
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   356
                TypeAnnotationPosition.methodReturn(typepath, env.getLambda(), -1);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   357
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   358
            // We don't have to walk down a type.  We just have to do
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   359
            // repeating annotation handling, then classify and attach
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   360
            // the annotations.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   361
            annotate.annotateWithClassifyLater(declAnnos, env, msym,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   362
                                               deferPos, tapos);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   363
            restype = syms.voidType;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   364
        }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   365
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   367
        // Attribute receiver type, if one is given.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   368
        Type recvtype;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   369
        if (recvparam!=null) {
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   370
            // The type will get annotated by visitVarDef
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   371
            memberEnter(recvparam, env, annotate.receiverCreator);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   372
            recvtype = recvparam.vartype.type;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   373
        } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   374
            recvtype = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   375
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   376
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
        // Attribute thrown exceptions.
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
   378
        ListBuffer<Type> thrownbuf = new ListBuffer<>();
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   379
        i = 0;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   380
        for (List<JCExpression> l = thrown; l.nonEmpty(); l = l.tail, i++) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
            Type exc = attr.attribType(l.head, env);
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   382
            // Annotate each exception type.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   383
            annotate.annotateTypeLater(l.head, env, msym, deferPos,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   384
                                       annotate.throwCreator(i));
18909
8f9fc5d876e4 8012242: Lambda compatibility and checked exceptions
mcimadamore
parents: 18643
diff changeset
   385
            if (!exc.hasTag(TYPEVAR)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
                exc = chk.checkClassType(l.head.pos(), exc);
18909
8f9fc5d876e4 8012242: Lambda compatibility and checked exceptions
mcimadamore
parents: 18643
diff changeset
   387
            } else if (exc.tsym.owner == msym) {
8f9fc5d876e4 8012242: Lambda compatibility and checked exceptions
mcimadamore
parents: 18643
diff changeset
   388
                //mark inference variables in 'throws' clause
8f9fc5d876e4 8012242: Lambda compatibility and checked exceptions
mcimadamore
parents: 18643
diff changeset
   389
                exc.tsym.flags_field |= THROWS;
8f9fc5d876e4 8012242: Lambda compatibility and checked exceptions
mcimadamore
parents: 18643
diff changeset
   390
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   391
            thrownbuf.append(exc);
06bc494ca11e Initial load
duke
parents:
diff changeset
   392
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   393
        MethodType mtype = new MethodType(argbuf.toList(),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
                                    restype,
06bc494ca11e Initial load
duke
parents:
diff changeset
   395
                                    thrownbuf.toList(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
                                    syms.methodClass);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   397
        mtype.recvtype = recvtype;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   398
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   399
        return tvars.isEmpty() ? mtype : new ForAll(tvars, mtype);
06bc494ca11e Initial load
duke
parents:
diff changeset
   400
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   401
06bc494ca11e Initial load
duke
parents:
diff changeset
   402
/* ********************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   403
 * Visitor methods for member enter
06bc494ca11e Initial load
duke
parents:
diff changeset
   404
 *********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   405
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   406
    ImportFilter staticImportFilter;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   407
    ImportFilter typeImportFilter = new ImportFilter() {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   408
        @Override
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   409
        public boolean accepts(Scope origin, Symbol t) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   410
            return t.kind == Kinds.TYP;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   411
        }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   412
    };
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   413
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   414
    protected void memberEnter(JCCompilationUnit tree, Env<AttrContext> env) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   415
        ImportFilter prevStaticImportFilter = staticImportFilter;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   416
        try {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   417
            final PackageSymbol packge = env.toplevel.packge;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   418
            this.staticImportFilter = new ImportFilter() {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   419
                @Override
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   420
                public boolean accepts(Scope origin, Symbol sym) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   421
                    return sym.isStatic() &&
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   422
                           chk.staticImportAccessible(sym, packge) &&
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   423
                           sym.isMemberOf((TypeSymbol) origin.owner, types);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   424
                }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   425
            };
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   426
            memberEnter((JCTree) tree, env);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   427
        } finally {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   428
            this.staticImportFilter = prevStaticImportFilter;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   429
        }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   430
    }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   431
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   432
    /** Visitor argument: the current environment
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   434
    protected Env<AttrContext> env;
06bc494ca11e Initial load
duke
parents:
diff changeset
   435
06bc494ca11e Initial load
duke
parents:
diff changeset
   436
    /** Enter field and method definitions and process import
06bc494ca11e Initial load
duke
parents:
diff changeset
   437
     *  clauses, catching any completion failure exceptions.
06bc494ca11e Initial load
duke
parents:
diff changeset
   438
     */
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   439
    protected void memberEnter(JCTree tree, Env<AttrContext> env,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   440
                               Annotate.PositionCreator creator) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   441
        Env<AttrContext> prevEnv = this.env;
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   442
        Annotate.PositionCreator prevCreator = this.creator;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   443
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   444
            this.env = env;
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   445
            this.creator = creator;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   446
            tree.accept(this);
06bc494ca11e Initial load
duke
parents:
diff changeset
   447
        }  catch (CompletionFailure ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   448
            chk.completionError(tree.pos(), ex);
06bc494ca11e Initial load
duke
parents:
diff changeset
   449
        } finally {
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   450
            this.creator = prevCreator;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   451
            this.env = prevEnv;
06bc494ca11e Initial load
duke
parents:
diff changeset
   452
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   453
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   454
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   455
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   456
    protected void memberEnter(JCTree tree, Env<AttrContext> env) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   457
        memberEnter(tree, env, annotate.noCreator);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   458
    }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   459
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   460
    /** Enter members from a list of trees.
06bc494ca11e Initial load
duke
parents:
diff changeset
   461
     */
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   462
    void memberEnter(List<? extends JCTree> trees,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   463
                     Env<AttrContext> env,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   464
                     Annotate.PositionCreator creator) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   465
        for (List<? extends JCTree> l = trees; l.nonEmpty(); l = l.tail)
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   466
            memberEnter(l.head, env, creator);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   467
    }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   468
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   469
    void memberEnter(List<? extends JCTree> trees,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   470
                     Env<AttrContext> env) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   471
        memberEnter(trees, env, annotate.noCreator);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   472
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   473
06bc494ca11e Initial load
duke
parents:
diff changeset
   474
    /** Enter members for a class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   475
     */
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   476
    void finishClass(final JCClassDecl tree, final Env<AttrContext> env) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   477
        if ((tree.mods.flags & Flags.ENUM) != 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   478
            (types.supertype(tree.sym.type).tsym.flags() & Flags.ENUM) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   479
            addEnumMembers(tree, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   480
        }
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   481
        memberEnter(tree.defs, env, annotate.fieldCreator);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   482
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   483
06bc494ca11e Initial load
duke
parents:
diff changeset
   484
    /** Add the implicit members for an enum type
06bc494ca11e Initial load
duke
parents:
diff changeset
   485
     *  to the symbol table.
06bc494ca11e Initial load
duke
parents:
diff changeset
   486
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   487
    private void addEnumMembers(JCClassDecl tree, Env<AttrContext> env) {
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
   488
        JCExpression valuesType = make.Type(new ArrayType(tree.sym.type, syms.arrayClass,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
   489
                                                          Type.noAnnotations));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   490
06bc494ca11e Initial load
duke
parents:
diff changeset
   491
        // public static T[] values() { return ???; }
06bc494ca11e Initial load
duke
parents:
diff changeset
   492
        JCMethodDecl values = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
   493
            MethodDef(make.Modifiers(Flags.PUBLIC|Flags.STATIC),
06bc494ca11e Initial load
duke
parents:
diff changeset
   494
                      names.values,
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
                      valuesType,
06bc494ca11e Initial load
duke
parents:
diff changeset
   496
                      List.<JCTypeParameter>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   497
                      List.<JCVariableDecl>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   498
                      List.<JCExpression>nil(), // thrown
06bc494ca11e Initial load
duke
parents:
diff changeset
   499
                      null, //make.Block(0, Tree.emptyList.prepend(make.Return(make.Ident(names._null)))),
06bc494ca11e Initial load
duke
parents:
diff changeset
   500
                      null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   501
        memberEnter(values, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   502
06bc494ca11e Initial load
duke
parents:
diff changeset
   503
        // public static T valueOf(String name) { return ???; }
06bc494ca11e Initial load
duke
parents:
diff changeset
   504
        JCMethodDecl valueOf = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
   505
            MethodDef(make.Modifiers(Flags.PUBLIC|Flags.STATIC),
06bc494ca11e Initial load
duke
parents:
diff changeset
   506
                      names.valueOf,
06bc494ca11e Initial load
duke
parents:
diff changeset
   507
                      make.Type(tree.sym.type),
06bc494ca11e Initial load
duke
parents:
diff changeset
   508
                      List.<JCTypeParameter>nil(),
15720
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15385
diff changeset
   509
                      List.of(make.VarDef(make.Modifiers(Flags.PARAMETER |
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15385
diff changeset
   510
                                                         Flags.MANDATED),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   511
                                            names.fromString("name"),
06bc494ca11e Initial load
duke
parents:
diff changeset
   512
                                            make.Type(syms.stringType), null)),
06bc494ca11e Initial load
duke
parents:
diff changeset
   513
                      List.<JCExpression>nil(), // thrown
06bc494ca11e Initial load
duke
parents:
diff changeset
   514
                      null, //make.Block(0, Tree.emptyList.prepend(make.Return(make.Ident(names._null)))),
06bc494ca11e Initial load
duke
parents:
diff changeset
   515
                      null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   516
        memberEnter(valueOf, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   517
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   518
06bc494ca11e Initial load
duke
parents:
diff changeset
   519
    public void visitTopLevel(JCCompilationUnit tree) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   520
        if (!tree.starImportScope.isEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
            // we must have already processed this toplevel
06bc494ca11e Initial load
duke
parents:
diff changeset
   522
            return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   524
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   525
        DiagnosticPosition prevLintPos = deferredLintHandler.immediate();
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   526
        Lint prevLint = chk.setLint(lint);
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   527
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   528
        try {
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   529
            // Import-on-demand java.lang.
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   530
            importAll(tree.pos, syms.enterPackage(names.java_lang), env);
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   531
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   532
            // Process the package def and all import clauses.
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   533
            memberEnter(tree.defs, env);
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   534
        } finally {
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   535
            chk.setLint(prevLint);
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   536
            deferredLintHandler.setPos(prevLintPos);
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   537
        }
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   538
    }
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   539
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   540
    public void visitPackageDef(JCPackageDecl tree) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   541
        // check that no class exists with same fully qualified name as
06bc494ca11e Initial load
duke
parents:
diff changeset
   542
        // toplevel package
06bc494ca11e Initial load
duke
parents:
diff changeset
   543
        if (checkClash && tree.pid != null) {
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 23129
diff changeset
   544
            Symbol p = env.toplevel.packge;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   545
            while (p.owner != syms.rootPackage) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   546
                p.owner.complete(); // enter all class members of p
06bc494ca11e Initial load
duke
parents:
diff changeset
   547
                if (syms.classes.get(p.getQualifiedName()) != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
                    log.error(tree.pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
                              "pkg.clashes.with.class.of.same.name",
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
                              p);
06bc494ca11e Initial load
duke
parents:
diff changeset
   551
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   552
                p = p.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   553
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   555
        // process package annotations
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   556
        annotate.annotateLater(tree.annotations, env, env.toplevel.packge);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   558
06bc494ca11e Initial load
duke
parents:
diff changeset
   559
    // process the non-static imports and the static imports of types.
06bc494ca11e Initial load
duke
parents:
diff changeset
   560
    public void visitImport(JCImport tree) {
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   561
        dependencies.push(AttributionKind.IMPORT, tree);
12081
42f541476d14 7133238: Merge proto-kind and proto-type into a single result class
mcimadamore
parents: 11709
diff changeset
   562
        JCFieldAccess imp = (JCFieldAccess)tree.qualid;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   563
        Name name = TreeInfo.name(imp);
06bc494ca11e Initial load
duke
parents:
diff changeset
   564
06bc494ca11e Initial load
duke
parents:
diff changeset
   565
        // Create a local environment pointing to this tree to disable
06bc494ca11e Initial load
duke
parents:
diff changeset
   566
        // effects of other imports in Resolve.findGlobalType
06bc494ca11e Initial load
duke
parents:
diff changeset
   567
        Env<AttrContext> localEnv = env.dup(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   568
12081
42f541476d14 7133238: Merge proto-kind and proto-type into a single result class
mcimadamore
parents: 11709
diff changeset
   569
        TypeSymbol p = attr.attribImportQualifier(tree, localEnv).tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   570
        if (name == names.asterisk) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   571
            // Import on demand.
12081
42f541476d14 7133238: Merge proto-kind and proto-type into a single result class
mcimadamore
parents: 11709
diff changeset
   572
            chk.checkCanonical(imp.selected);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   573
            if (tree.staticImport)
06bc494ca11e Initial load
duke
parents:
diff changeset
   574
                importStaticAll(tree.pos, p, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   575
            else
06bc494ca11e Initial load
duke
parents:
diff changeset
   576
                importAll(tree.pos, p, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   577
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   578
            // Named type import.
06bc494ca11e Initial load
duke
parents:
diff changeset
   579
            if (tree.staticImport) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   580
                importNamedStatic(tree.pos(), p, name, localEnv);
12081
42f541476d14 7133238: Merge proto-kind and proto-type into a single result class
mcimadamore
parents: 11709
diff changeset
   581
                chk.checkCanonical(imp.selected);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   582
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   583
                TypeSymbol c = attribImportType(imp, localEnv).tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   584
                chk.checkCanonical(imp);
06bc494ca11e Initial load
duke
parents:
diff changeset
   585
                importNamed(tree.pos(), c, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   586
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   587
        }
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   588
        dependencies.pop();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   589
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   590
06bc494ca11e Initial load
duke
parents:
diff changeset
   591
    public void visitMethodDef(JCMethodDecl tree) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   592
        WriteableScope enclScope = enter.enterScope(env);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   593
        MethodSymbol m = new MethodSymbol(0, tree.name, null, enclScope.owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
   594
        m.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, m, tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   595
        tree.sym = m;
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
   596
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
   597
        //if this is a default method, add the DEFAULT flag to the enclosing interface
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
   598
        if ((tree.mods.flags & DEFAULT) != 0) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
   599
            m.enclClass().flags_field |= DEFAULT;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
   600
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
   601
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   602
        Env<AttrContext> localEnv = methodEnv(tree, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   603
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   604
            DiagnosticPosition prevLintPos = deferredLintHandler.setPos(tree.pos());
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   605
            try {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   606
                // Compute the method type
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   607
                m.type = signature(m, tree.typarams, tree.params,
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   608
                                   tree.restype, tree.recvparam,
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   609
                               tree.thrown, localEnv,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   610
                               tree.mods.annotations, tree.pos());
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   611
            } finally {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   612
                deferredLintHandler.setPos(prevLintPos);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   613
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   614
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   615
            if (types.isSignaturePolymorphic(m)) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   616
                m.flags_field |= SIGNATURE_POLYMORPHIC;
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   617
            }
18389
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18010
diff changeset
   618
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   619
            // Set m.params
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
   620
            ListBuffer<VarSymbol> params = new ListBuffer<>();
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   621
            JCVariableDecl lastParam = null;
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   622
            for (List<JCVariableDecl> l = tree.params; l.nonEmpty(); l = l.tail) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   623
                JCVariableDecl param = lastParam = l.head;
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   624
                params.append(Assert.checkNonNull(param.sym));
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   625
            }
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   626
            m.params = params.toList();
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   627
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   628
            // mark the method varargs, if necessary
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   629
            if (lastParam != null && (lastParam.mods.flags & Flags.VARARGS) != 0)
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   630
                m.flags_field |= Flags.VARARGS;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   631
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   632
            localEnv.info.scope.leave();
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   633
            if (chk.checkUnique(tree.pos(), m, enclScope)) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   634
            enclScope.enter(m);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   635
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   636
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   637
            if (tree.defaultValue != null)
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   638
            annotateDefaultValueLater(tree.defaultValue, localEnv,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   639
                                      m, annotate.noCreator);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   640
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   641
06bc494ca11e Initial load
duke
parents:
diff changeset
   642
    /** Create a fresh environment for method bodies.
06bc494ca11e Initial load
duke
parents:
diff changeset
   643
     *  @param tree     The method definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   644
     *  @param env      The environment current outside of the method definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   645
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   646
    Env<AttrContext> methodEnv(JCMethodDecl tree, Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   647
        Env<AttrContext> localEnv =
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   648
            env.dup(tree, env.info.dup(env.info.scope.dupUnshared(tree.sym)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   649
        localEnv.enclMethod = tree;
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14051
diff changeset
   650
        if (tree.sym.type != null) {
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14051
diff changeset
   651
            //when this is called in the enter stage, there's no type to be set
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14051
diff changeset
   652
            localEnv.info.returnResult = attr.new ResultInfo(VAL, tree.sym.type.getReturnType());
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 14051
diff changeset
   653
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   654
        if ((tree.mods.flags & STATIC) != 0) localEnv.info.staticLevel++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   655
        return localEnv;
06bc494ca11e Initial load
duke
parents:
diff changeset
   656
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   657
06bc494ca11e Initial load
duke
parents:
diff changeset
   658
    public void visitVarDef(JCVariableDecl tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   659
        Env<AttrContext> localEnv = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
   660
        if ((tree.mods.flags & STATIC) != 0 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
   661
            (env.info.scope.owner.flags() & INTERFACE) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   662
            localEnv = env.dup(tree, env.info.dup());
06bc494ca11e Initial load
duke
parents:
diff changeset
   663
            localEnv.info.staticLevel++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   664
        }
19942
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   665
        DiagnosticPosition prevLintPos = deferredLintHandler.setPos(tree.pos());
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   666
        annotate.enterStart();
8236
0d8646b7c602 6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents: 8225
diff changeset
   667
        try {
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   668
            try {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   669
                if (TreeInfo.isEnumInit(tree)) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   670
                    attr.attribIdentAsEnumType(localEnv, (JCIdent)tree.vartype);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   671
                } else {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   672
                    attr.attribType(tree.vartype, localEnv);
24903
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   673
                    if (TreeInfo.isReceiverParam(tree))
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   674
                        checkReceiver(tree, localEnv);
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16558
diff changeset
   675
                }
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   676
            } finally {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   677
                deferredLintHandler.setPos(prevLintPos);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   678
            }
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   679
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   680
            if ((tree.mods.flags & VARARGS) != 0) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   681
                //if we are entering a varargs parameter, we need to
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   682
                //replace its type (a plain array type) with the more
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   683
                //precise VarargsType --- we need to do it this way
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   684
                //because varargs is represented in the tree as a
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   685
                //modifier on the parameter declaration, and not as a
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   686
                //distinct type of array node.
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
   687
                ArrayType atype = (ArrayType)tree.vartype.type;
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   688
                tree.vartype.type = atype.makeVarargs();
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   689
            }
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   690
            WriteableScope enclScope = enter.enterScope(env);
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   691
            VarSymbol v =
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   692
                new VarSymbol(0, tree.name, tree.vartype.type, enclScope.owner);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   693
            v.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, v, tree);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   694
            tree.sym = v;
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   695
            if (tree.init != null) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   696
                v.flags_field |= HASINIT;
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   697
                if ((v.flags_field & FINAL) != 0 &&
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   698
                    needsLazyConstValue(tree.init)) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   699
                    Env<AttrContext> initEnv = getInitEnv(tree, env);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   700
                    initEnv.info.enclVar = v;
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   701
                    v.setLazyConstValue(initEnv(tree, initEnv), attr, tree);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   702
                }
12916
021c069e8e27 7160084: javac fails to compile an apparently valid class/interface combination
mcimadamore
parents: 12335
diff changeset
   703
            }
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   704
            if (chk.checkUnique(tree.pos(), v, enclScope)) {
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   705
                chk.checkTransparentVar(tree.pos(), v, enclScope);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   706
                enclScope.enter(v);
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   707
            }
24903
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   708
            if (TreeInfo.isReceiverParam(tree)) {
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   709
                // If we are dealing with a receiver parameter, then
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   710
                // we only allow base type annotations to be type
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   711
                // annotations.  Receivers are not allowed to have
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   712
                // declaration annotations.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   713
                annotate.annotateStrictTypeLater(tree.vartype, tree.mods.annotations,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   714
                                                 localEnv, v, tree.pos(), creator);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   715
            } else {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   716
                // Otherwise, we annotate the type.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   717
                annotate.annotateTypeLater(tree.vartype, tree.mods.annotations,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   718
                                           localEnv, v, tree.pos(), creator);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   719
            }
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   720
            v.pos = tree.pos;
8236
0d8646b7c602 6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
mcimadamore
parents: 8225
diff changeset
   721
        } finally {
21498
58c2486db8d0 8006732: support correct bytecode storage of type annotations in multicatch
emc
parents: 21040
diff changeset
   722
            annotate.enterDone();
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7615
diff changeset
   723
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   724
    }
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16558
diff changeset
   725
    // where
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16558
diff changeset
   726
    void checkType(JCTree tree, Type type, String diag) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16558
diff changeset
   727
        if (!tree.type.isErroneous() && !types.isSameType(tree.type, type)) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16558
diff changeset
   728
            log.error(tree, diag, type, tree.type);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16558
diff changeset
   729
        }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16558
diff changeset
   730
    }
24903
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   731
    void checkReceiver(JCVariableDecl tree, Env<AttrContext> localEnv) {
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   732
        attr.attribExpr(tree.nameexpr, localEnv);
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   733
        MethodSymbol m = localEnv.enclMethod.sym;
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   734
        if (m.isConstructor()) {
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   735
            Type outertype = m.owner.owner.type;
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   736
            if (outertype.hasTag(TypeTag.METHOD)) {
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   737
                // we have a local inner class
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   738
                outertype = m.owner.owner.owner.type;
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   739
            }
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   740
            if (outertype.hasTag(TypeTag.CLASS)) {
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   741
                checkType(tree.vartype, outertype, "incorrect.constructor.receiver.type");
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   742
                checkType(tree.nameexpr, outertype, "incorrect.constructor.receiver.name");
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   743
            } else {
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   744
                log.error(tree, "receiver.parameter.not.applicable.constructor.toplevel.class");
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   745
            }
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   746
        } else {
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   747
            checkType(tree.vartype, m.owner.type, "incorrect.receiver.type");
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   748
            checkType(tree.nameexpr, m.owner.type, "incorrect.receiver.name");
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   749
        }
41e1812d6b4c 8027886: javac allows illegal receiver parameters
pgovereau
parents: 24895
diff changeset
   750
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   751
19656
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   752
    public boolean needsLazyConstValue(JCTree tree) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   753
        InitTreeVisitor initTreeVisitor = new InitTreeVisitor();
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   754
        tree.accept(initTreeVisitor);
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   755
        return initTreeVisitor.result;
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   756
    }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   757
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   758
    /** Visitor class for expressions which might be constant expressions.
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   759
     */
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   760
    static class InitTreeVisitor extends JCTree.Visitor {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   761
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   762
        private boolean result = true;
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   763
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   764
        @Override
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   765
        public void visitTree(JCTree tree) {}
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   766
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   767
        @Override
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   768
        public void visitNewClass(JCNewClass that) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   769
            result = false;
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   770
        }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   771
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   772
        @Override
19942
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   773
        public void visitNewArray(JCNewArray that) {
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   774
            result = false;
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   775
        }
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   776
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   777
        @Override
19656
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   778
        public void visitLambda(JCLambda that) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   779
            result = false;
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   780
        }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   781
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   782
        @Override
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   783
        public void visitReference(JCMemberReference that) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   784
            result = false;
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   785
        }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   786
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   787
        @Override
19942
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   788
        public void visitApply(JCMethodInvocation that) {
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   789
            result = false;
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   790
        }
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   791
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   792
        @Override
19656
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   793
        public void visitSelect(JCFieldAccess tree) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   794
            tree.selected.accept(this);
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   795
        }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   796
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   797
        @Override
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   798
        public void visitConditional(JCConditional tree) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   799
            tree.cond.accept(this);
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   800
            tree.truepart.accept(this);
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   801
            tree.falsepart.accept(this);
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   802
        }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   803
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   804
        @Override
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   805
        public void visitParens(JCParens tree) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   806
            tree.expr.accept(this);
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   807
        }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   808
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   809
        @Override
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   810
        public void visitTypeCast(JCTypeCast tree) {
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   811
            tree.expr.accept(this);
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   812
        }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   813
    }
7f0afbdbf142 8023112: javac should not use lazy constant evaluation approach for method references
vromero
parents: 19651
diff changeset
   814
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   815
    /** Create a fresh environment for a variable's initializer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   816
     *  If the variable is a field, the owner of the environment's scope
06bc494ca11e Initial load
duke
parents:
diff changeset
   817
     *  is be the variable itself, otherwise the owner is the method
06bc494ca11e Initial load
duke
parents:
diff changeset
   818
     *  enclosing the variable definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   819
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   820
     *  @param tree     The variable definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   821
     *  @param env      The environment current outside of the variable definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   822
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   823
    Env<AttrContext> initEnv(JCVariableDecl tree, Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   824
        Env<AttrContext> localEnv = env.dupto(new AttrContextEnv(tree, env.info.dup()));
06bc494ca11e Initial load
duke
parents:
diff changeset
   825
        if (tree.sym.owner.kind == TYP) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
   826
            localEnv.info.scope = env.info.scope.dupUnshared(tree.sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   827
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   828
        if ((tree.mods.flags & STATIC) != 0 ||
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
   829
                ((env.enclClass.sym.flags() & INTERFACE) != 0 && env.enclMethod == null))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   830
            localEnv.info.staticLevel++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   831
        return localEnv;
06bc494ca11e Initial load
duke
parents:
diff changeset
   832
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   833
06bc494ca11e Initial load
duke
parents:
diff changeset
   834
    /** Default member enter visitor method: do nothing
06bc494ca11e Initial load
duke
parents:
diff changeset
   835
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   836
    public void visitTree(JCTree tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   837
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   838
06bc494ca11e Initial load
duke
parents:
diff changeset
   839
    public void visitErroneous(JCErroneous tree) {
6929
81a6a7c1bef1 6988407: javac crashes running processor on errant code; it used to print error message
jjg
parents: 6721
diff changeset
   840
        if (tree.errs != null)
81a6a7c1bef1 6988407: javac crashes running processor on errant code; it used to print error message
jjg
parents: 6721
diff changeset
   841
            memberEnter(tree.errs, env);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   842
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   843
06bc494ca11e Initial load
duke
parents:
diff changeset
   844
    public Env<AttrContext> getMethodEnv(JCMethodDecl tree, Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   845
        Env<AttrContext> mEnv = methodEnv(tree, env);
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17999
diff changeset
   846
        mEnv.info.lint = mEnv.info.lint.augment(tree.sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   847
        for (List<JCTypeParameter> l = tree.typarams; l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
   848
            mEnv.info.scope.enterIfAbsent(l.head.type.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   849
        for (List<JCVariableDecl> l = tree.params; l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
   850
            mEnv.info.scope.enterIfAbsent(l.head.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   851
        return mEnv;
06bc494ca11e Initial load
duke
parents:
diff changeset
   852
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   853
06bc494ca11e Initial load
duke
parents:
diff changeset
   854
    public Env<AttrContext> getInitEnv(JCVariableDecl tree, Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   855
        Env<AttrContext> iEnv = initEnv(tree, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   856
        return iEnv;
06bc494ca11e Initial load
duke
parents:
diff changeset
   857
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   858
06bc494ca11e Initial load
duke
parents:
diff changeset
   859
/* ********************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   860
 * Type completion
06bc494ca11e Initial load
duke
parents:
diff changeset
   861
 *********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   862
06bc494ca11e Initial load
duke
parents:
diff changeset
   863
    Type attribImportType(JCTree tree, Env<AttrContext> env) {
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
   864
        Assert.check(completionEnabled);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   865
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   866
            // To prevent deep recursion, suppress completion of some
06bc494ca11e Initial load
duke
parents:
diff changeset
   867
            // types.
06bc494ca11e Initial load
duke
parents:
diff changeset
   868
            completionEnabled = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   869
            return attr.attribType(tree, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   870
        } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
   871
            completionEnabled = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   872
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   873
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   874
06bc494ca11e Initial load
duke
parents:
diff changeset
   875
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   876
     * Check if a list of annotations contains a reference to
06bc494ca11e Initial load
duke
parents:
diff changeset
   877
     * java.lang.Deprecated.
06bc494ca11e Initial load
duke
parents:
diff changeset
   878
     **/
06bc494ca11e Initial load
duke
parents:
diff changeset
   879
    private boolean hasDeprecatedAnnotation(List<JCAnnotation> annotations) {
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 12917
diff changeset
   880
        for (List<JCAnnotation> al = annotations; !al.isEmpty(); al = al.tail) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   881
            JCAnnotation a = al.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
   882
            if (a.annotationType.type == syms.deprecatedType && a.args.isEmpty())
06bc494ca11e Initial load
duke
parents:
diff changeset
   883
                return true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   884
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   885
        return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   886
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   887
06bc494ca11e Initial load
duke
parents:
diff changeset
   888
    /** Queue processing of an attribute default value. */
06bc494ca11e Initial load
duke
parents:
diff changeset
   889
    void annotateDefaultValueLater(final JCExpression defaultValue,
06bc494ca11e Initial load
duke
parents:
diff changeset
   890
                                   final Env<AttrContext> localEnv,
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   891
                                   final MethodSymbol m,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   892
                                   final Annotate.PositionCreator creator) {
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21018
diff changeset
   893
        annotate.normal(new Annotate.Worker() {
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 12917
diff changeset
   894
                @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   895
                public String toString() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   896
                    return "annotate " + m.owner + "." +
06bc494ca11e Initial load
duke
parents:
diff changeset
   897
                        m + " default " + defaultValue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   898
                }
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 12917
diff changeset
   899
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 12917
diff changeset
   900
                @Override
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21018
diff changeset
   901
                public void run() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   902
                    JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
06bc494ca11e Initial load
duke
parents:
diff changeset
   903
                    try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   904
                        enterDefaultValue(defaultValue, localEnv, m);
06bc494ca11e Initial load
duke
parents:
diff changeset
   905
                    } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
   906
                        log.useSource(prev);
06bc494ca11e Initial load
duke
parents:
diff changeset
   907
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   908
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   909
            });
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21018
diff changeset
   910
        annotate.validate(new Annotate.Worker() { //validate annotations
21018
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   911
            @Override
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21018
diff changeset
   912
            public void run() {
21018
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   913
                JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   914
                try {
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   915
                    // if default value is an annotation, check it is a well-formed
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   916
                    // annotation value (e.g. no duplicate values, no missing values, etc.)
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   917
                    chk.validateAnnotationTree(defaultValue);
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   918
                } finally {
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   919
                    log.useSource(prev);
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   920
                }
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   921
            }
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   922
        });
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   923
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   924
06bc494ca11e Initial load
duke
parents:
diff changeset
   925
    /** Enter a default value for an attribute method. */
06bc494ca11e Initial load
duke
parents:
diff changeset
   926
    private void enterDefaultValue(final JCExpression defaultValue,
06bc494ca11e Initial load
duke
parents:
diff changeset
   927
                                   final Env<AttrContext> localEnv,
06bc494ca11e Initial load
duke
parents:
diff changeset
   928
                                   final MethodSymbol m) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   929
        m.defaultValue = annotate.enterAttributeValue(m.type.getReturnType(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   930
                                                      defaultValue,
06bc494ca11e Initial load
duke
parents:
diff changeset
   931
                                                      localEnv);
06bc494ca11e Initial load
duke
parents:
diff changeset
   932
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   933
06bc494ca11e Initial load
duke
parents:
diff changeset
   934
/* ********************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   935
 * Source completer
06bc494ca11e Initial load
duke
parents:
diff changeset
   936
 *********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   937
06bc494ca11e Initial load
duke
parents:
diff changeset
   938
    /** Complete entering a class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   939
     *  @param sym         The symbol of the class to be completed.
06bc494ca11e Initial load
duke
parents:
diff changeset
   940
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   941
    public void complete(Symbol sym) throws CompletionFailure {
06bc494ca11e Initial load
duke
parents:
diff changeset
   942
        // Suppress some (recursive) MemberEnter invocations
06bc494ca11e Initial load
duke
parents:
diff changeset
   943
        if (!completionEnabled) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   944
            // Re-install same completer for next time around and return.
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
   945
            Assert.check((sym.flags() & Flags.COMPOUND) == 0);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   946
            sym.completer = this;
06bc494ca11e Initial load
duke
parents:
diff changeset
   947
            return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   948
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   949
06bc494ca11e Initial load
duke
parents:
diff changeset
   950
        ClassSymbol c = (ClassSymbol)sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   951
        ClassType ct = (ClassType)c.type;
25007
eb097d3a68f5 8038975: Access control in enhanced for
pgovereau
parents: 24903
diff changeset
   952
        Env<AttrContext> env = typeEnvs.get(c);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   953
        JCClassDecl tree = (JCClassDecl)env.tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
   954
        boolean wasFirst = isFirst;
06bc494ca11e Initial load
duke
parents:
diff changeset
   955
        isFirst = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   956
06bc494ca11e Initial load
duke
parents:
diff changeset
   957
        JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
19942
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
   958
        DiagnosticPosition prevLintPos = deferredLintHandler.setPos(tree.pos());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   959
        try {
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   960
            dependencies.push(c);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   961
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   962
            // Save class environment for later member enter (2) processing.
06bc494ca11e Initial load
duke
parents:
diff changeset
   963
            halfcompleted.append(env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   964
1043
11ea4773b0af 6695838: javac does not detect cyclic inheritance involving static inner classes after import clause
mcimadamore
parents: 1040
diff changeset
   965
            // Mark class as not yet attributed.
11ea4773b0af 6695838: javac does not detect cyclic inheritance involving static inner classes after import clause
mcimadamore
parents: 1040
diff changeset
   966
            c.flags_field |= UNATTRIBUTED;
11ea4773b0af 6695838: javac does not detect cyclic inheritance involving static inner classes after import clause
mcimadamore
parents: 1040
diff changeset
   967
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   968
            // If this is a toplevel-class, make sure any preceding import
06bc494ca11e Initial load
duke
parents:
diff changeset
   969
            // clauses have been seen.
06bc494ca11e Initial load
duke
parents:
diff changeset
   970
            if (c.owner.kind == PCK) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 9082
diff changeset
   971
                memberEnter(env.toplevel, env.enclosing(TOPLEVEL));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   972
                todo.append(env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   973
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   974
06bc494ca11e Initial load
duke
parents:
diff changeset
   975
            if (c.owner.kind == TYP)
06bc494ca11e Initial load
duke
parents:
diff changeset
   976
                c.owner.complete();
06bc494ca11e Initial load
duke
parents:
diff changeset
   977
06bc494ca11e Initial load
duke
parents:
diff changeset
   978
            // create an environment for evaluating the base clauses
06bc494ca11e Initial load
duke
parents:
diff changeset
   979
            Env<AttrContext> baseEnv = baseEnv(tree, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
   980
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   981
            // Annotations.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   982
            // In general, we cannot fully process annotations yet,  but we
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   983
            // can attribute the annotation types and then check to see if the
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   984
            // @Deprecated annotation is present.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   985
            attr.attribAnnotationTypes(tree.mods.annotations, baseEnv);
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   986
            if (hasDeprecatedAnnotation(tree.mods.annotations))
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   987
                c.flags_field |= DEPRECATED;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   988
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   989
            // Don't attach declaration annotations to anonymous
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   990
            // classes, they get handled specially below.
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   991
            if (!sym.isAnonymous()) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   992
                annotate.annotateLater(tree.mods.annotations, baseEnv,
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   993
                                       c, tree.pos());
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   994
            }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
   995
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   996
            // Determine supertype.
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   997
            Type supertype;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   998
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
   999
            if (tree.extending != null) {
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1000
                dependencies.push(AttributionKind.EXTENDS, tree.extending);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1001
                try {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1002
                    supertype = attr.attribBase(tree.extending, baseEnv,
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1003
                            true, false, true);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1004
                    if (sym.isAnonymous()) {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1005
                        annotate.annotateAnonClassDefLater(tree.extending,
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1006
                                tree.mods.annotations,
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1007
                                baseEnv, sym, tree.pos(),
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1008
                                annotate.extendsCreator);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1009
                    } else {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1010
                        annotate.annotateTypeLater(tree.extending, baseEnv, sym,
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1011
                                tree.pos(), annotate.extendsCreator);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1012
                    }
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1013
                } finally {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1014
                    dependencies.pop();
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1015
                }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1016
            } else {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1017
                supertype = ((tree.mods.flags & Flags.ENUM) != 0)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1018
                ? attr.attribBase(enumBase(tree.pos, c), baseEnv,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1019
                                  true, false, false)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1020
                : (c.fullname == names.java_lang_Object)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1021
                ? Type.noType
06bc494ca11e Initial load
duke
parents:
diff changeset
  1022
                : syms.objectType;
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1023
            }
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1024
            ct.supertype_field = modelMissingTypes(supertype, tree.extending, false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1025
06bc494ca11e Initial load
duke
parents:
diff changeset
  1026
            // Determine interfaces.
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
  1027
            ListBuffer<Type> interfaces = new ListBuffer<>();
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1028
            ListBuffer<Type> all_interfaces = null; // lazy init
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
  1029
            Set<Type> interfaceSet = new HashSet<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1030
            List<JCExpression> interfaceTrees = tree.implementing;
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1031
            int i = 0;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1032
            for (JCExpression iface : interfaceTrees) {
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1033
                dependencies.push(AttributionKind.IMPLEMENTS, iface);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1034
                try {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1035
                    Type it = attr.attribBase(iface, baseEnv, false, true, true);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1036
                    if (it.hasTag(CLASS)) {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1037
                        interfaces.append(it);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1038
                        if (all_interfaces != null) all_interfaces.append(it);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1039
                        chk.checkNotRepeated(iface.pos(), types.erasure(it), interfaceSet);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1040
                    } else {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1041
                        if (all_interfaces == null)
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1042
                            all_interfaces = new ListBuffer<Type>().appendList(interfaces);
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1043
                        all_interfaces.append(modelMissingTypes(it, iface, true));
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1044
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1045
                    }
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1046
                    if (sym.isAnonymous()) {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1047
                        // Note: if an anonymous class ever has more than
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1048
                        // one supertype for some reason, this will
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1049
                        // incorrectly attach tree.mods.annotations to ALL
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1050
                        // supertypes, not just the first.
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1051
                        annotate.annotateAnonClassDefLater(iface, tree.mods.annotations,
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1052
                                baseEnv, sym, tree.pos(),
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1053
                                annotate.implementsCreator(i++));
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1054
                    } else {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1055
                        annotate.annotateTypeLater(iface, baseEnv, sym, tree.pos(),
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1056
                                annotate.implementsCreator(i++));
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1057
                    }
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1058
                } finally {
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1059
                    dependencies.pop();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1060
                }
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1061
            }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1062
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1063
            if ((c.flags_field & ANNOTATION) != 0) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1064
                ct.interfaces_field = List.of(syms.annotationType);
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1065
                ct.all_interfaces_field = ct.interfaces_field;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1066
            }  else {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1067
                ct.interfaces_field = interfaces.toList();
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1068
                ct.all_interfaces_field = (all_interfaces == null)
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1069
                        ? ct.interfaces_field : all_interfaces.toList();
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1070
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1071
06bc494ca11e Initial load
duke
parents:
diff changeset
  1072
            if (c.fullname == names.java_lang_Object) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1073
                if (tree.extending != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1074
                    chk.checkNonCyclic(tree.extending.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1075
                                       supertype);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1076
                    ct.supertype_field = Type.noType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1077
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1078
                else if (tree.implementing.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1079
                    chk.checkNonCyclic(tree.implementing.head.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1080
                                       ct.interfaces_field.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1081
                    ct.interfaces_field = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1082
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1083
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1084
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
  1085
            // class type parameters use baseEnv but everything uses env
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1086
6711
fc9732adc790 6863465: javac doesn't detect circular subclass dependencies via qualified names
mcimadamore
parents: 6709
diff changeset
  1087
            chk.checkNonCyclicDecl(tree);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1088
165
1875ac59896a 6663588: Compiler goes into infinite loop for Cyclic Inheritance test case
mcimadamore
parents: 10
diff changeset
  1089
            attr.attribTypeVariables(tree.typarams, baseEnv);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
  1090
            // Do this here, where we have the symbol.
24895
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1091
            int j = 0;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1092
            for (List<JCTypeParameter> l = tree.typarams; l.nonEmpty();
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1093
                 l = l.tail, j++) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1094
                final JCTypeParameter typaram = l.head;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1095
                annotate.annotateTypeLater(typaram, baseEnv, sym, tree.pos(),
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1096
                                           annotate.typeParamCreator(j));
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1097
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1098
                int k = 0;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1099
                for(List<JCExpression> b = typaram.bounds; b.nonEmpty();
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1100
                    b = b.tail, k++) {
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1101
                    final JCExpression bound = b.head;
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1102
                    annotate.annotateTypeLater(bound, baseEnv, sym, tree.pos(),
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1103
                                               annotate.typeParamBoundCreator(typaram, j, k));
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1104
                }
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1105
dd091d389fbf 8027262: Determine location for type annotations earlier in compiler pipeline
emc
parents: 24604
diff changeset
  1106
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1107
06bc494ca11e Initial load
duke
parents:
diff changeset
  1108
            // Add default constructor if needed.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1109
            if ((c.flags() & INTERFACE) == 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1110
                !TreeInfo.hasConstructors(tree.defs)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1111
                List<Type> argtypes = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1112
                List<Type> typarams = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1113
                List<Type> thrown = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1114
                long ctorFlags = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1115
                boolean based = false;
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1116
                boolean addConstructor = true;
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1117
                JCNewClass nc = null;
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1045
diff changeset
  1118
                if (c.name.isEmpty()) {
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1119
                    nc = (JCNewClass)env.next.tree;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1120
                    if (nc.constructor != null) {
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1121
                        addConstructor = nc.constructor.kind != ERR;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1122
                        Type superConstrType = types.memberType(c.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1123
                                                                nc.constructor);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1124
                        argtypes = superConstrType.getParameterTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1125
                        typarams = superConstrType.getTypeArguments();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1126
                        ctorFlags = nc.constructor.flags() & VARARGS;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1127
                        if (nc.encl != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1128
                            argtypes = argtypes.prepend(nc.encl.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1129
                            based = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1130
                        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1131
                        thrown = superConstrType.getThrownTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1132
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1133
                }
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1134
                if (addConstructor) {
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1135
                    MethodSymbol basedConstructor = nc != null ?
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1136
                            (MethodSymbol)nc.constructor : null;
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1137
                    JCTree constrDef = DefaultConstructor(make.at(tree.pos), c,
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1138
                                                        basedConstructor,
14051
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1139
                                                        typarams, argtypes, thrown,
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1140
                                                        ctorFlags, based);
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1141
                    tree.defs = tree.defs.prepend(constrDef);
9097cec96212 7188968: New instance creation expression using diamond is checked twice
mcimadamore
parents: 13689
diff changeset
  1142
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1143
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1144
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1145
            // enter symbols for 'this' into current scope.
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1146
            VarSymbol thisSym =
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1147
                new VarSymbol(FINAL | HASINIT, names._this, c.type, c);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1148
            thisSym.pos = Position.FIRSTPOS;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1149
            env.info.scope.enter(thisSym);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1150
            // if this is a class, enter symbol for 'super' into current scope.
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1151
            if ((c.flags_field & INTERFACE) == 0 &&
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1152
                    ct.supertype_field.hasTag(CLASS)) {
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1153
                VarSymbol superSym =
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1154
                    new VarSymbol(FINAL | HASINIT, names._super,
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1155
                                  ct.supertype_field, c);
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1156
                superSym.pos = Position.FIRSTPOS;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14369
diff changeset
  1157
                env.info.scope.enter(superSym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1158
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1159
06bc494ca11e Initial load
duke
parents:
diff changeset
  1160
            // check that no package exists with same fully qualified name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1161
            // but admit classes in the unnamed package which have the same
06bc494ca11e Initial load
duke
parents:
diff changeset
  1162
            // name as a top-level package.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1163
            if (checkClash &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1164
                c.owner.kind == PCK && c.owner != syms.unnamedPackage &&
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22163
diff changeset
  1165
                syms.packageExists(c.fullname)) {
14369
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1166
                log.error(tree.pos, "clash.with.pkg.of.same.name", Kinds.kindName(sym), c);
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1167
            }
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1168
            if (c.owner.kind == PCK && (c.flags_field & PUBLIC) == 0 &&
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1169
                !env.toplevel.sourcefile.isNameCompatible(c.name.toString(),JavaFileObject.Kind.SOURCE)) {
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1170
                c.flags_field |= AUXILIARY;
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1171
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1172
        } catch (CompletionFailure ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1173
            chk.completionError(tree.pos(), ex);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1174
        } finally {
19942
e9dae0e41075 8021112: Spurious unchecked warning reported by javac
jlahoda
parents: 19941
diff changeset
  1175
            deferredLintHandler.setPos(prevLintPos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1176
            log.useSource(prev);
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
  1177
            dependencies.pop();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1178
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1179
06bc494ca11e Initial load
duke
parents:
diff changeset
  1180
        // Enter all member fields and methods of a set of half completed
06bc494ca11e Initial load
duke
parents:
diff changeset
  1181
        // classes in a second phase.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1182
        if (wasFirst) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1183
            Set<JCCompilationUnit> topLevels = new HashSet<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1184
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1185
                while (halfcompleted.nonEmpty()) {
21018
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
  1186
                    Env<AttrContext> toFinish = halfcompleted.next();
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1187
                    topLevels.add(toFinish.toplevel);
21018
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
  1188
                    finish(toFinish);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1189
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1190
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1191
                isFirst = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1192
            }
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1193
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1194
            for (JCCompilationUnit toplevel : topLevels) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1195
                chk.checkImportsResolvable(toplevel);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1196
            }
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1197
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
  1198
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14443
diff changeset
  1199
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1200
06bc494ca11e Initial load
duke
parents:
diff changeset
  1201
    private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1202
        WriteableScope baseScope = WriteableScope.create(tree.sym);
6352
217d5a69681a 6977800: Regression: invalid resolution of supertype for local class
mcimadamore
parents: 5857
diff changeset
  1203
        //import already entered local classes into base scope
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1204
        for (Symbol sym : env.outer.info.scope.getSymbols(NON_RECURSIVE)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1205
            if (sym.isLocal()) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 25007
diff changeset
  1206
                baseScope.enter(sym);
6352
217d5a69681a 6977800: Regression: invalid resolution of supertype for local class
mcimadamore
parents: 5857
diff changeset
  1207
            }
217d5a69681a 6977800: Regression: invalid resolution of supertype for local class
mcimadamore
parents: 5857
diff changeset
  1208
        }
217d5a69681a 6977800: Regression: invalid resolution of supertype for local class
mcimadamore
parents: 5857
diff changeset
  1209
        //import current type-parameters into base scope
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1210
        if (tree.typarams != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1211
            for (List<JCTypeParameter> typarams = tree.typarams;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1212
                 typarams.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1213
                 typarams = typarams.tail)
6352
217d5a69681a 6977800: Regression: invalid resolution of supertype for local class
mcimadamore
parents: 5857
diff changeset
  1214
                baseScope.enter(typarams.head.type.tsym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1215
        Env<AttrContext> outer = env.outer; // the base clause can't see members of this class
6352
217d5a69681a 6977800: Regression: invalid resolution of supertype for local class
mcimadamore
parents: 5857
diff changeset
  1216
        Env<AttrContext> localEnv = outer.dup(tree, outer.info.dup(baseScope));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1217
        localEnv.baseClause = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1218
        localEnv.outer = outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1219
        localEnv.info.isSelfCall = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1220
        return localEnv;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1221
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1222
06bc494ca11e Initial load
duke
parents:
diff changeset
  1223
    /** Enter member fields and methods of a class
06bc494ca11e Initial load
duke
parents:
diff changeset
  1224
     *  @param env        the environment current for the class block.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1225
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1226
    private void finish(Env<AttrContext> env) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1227
        JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1228
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1229
            JCClassDecl tree = (JCClassDecl)env.tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1230
            finishClass(tree, env);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1231
        } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1232
            log.useSource(prev);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1233
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1234
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1235
06bc494ca11e Initial load
duke
parents:
diff changeset
  1236
    /** Generate a base clause for an enum type.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1237
     *  @param pos              The position for trees and diagnostics, if any
06bc494ca11e Initial load
duke
parents:
diff changeset
  1238
     *  @param c                The class symbol of the enum
06bc494ca11e Initial load
duke
parents:
diff changeset
  1239
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1240
    private JCExpression enumBase(int pos, ClassSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1241
        JCExpression result = make.at(pos).
06bc494ca11e Initial load
duke
parents:
diff changeset
  1242
            TypeApply(make.QualIdent(syms.enumSym),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1243
                      List.<JCExpression>of(make.Type(c.type)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1244
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1245
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1246
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1247
    Type modelMissingTypes(Type t, final JCExpression tree, final boolean interfaceExpected) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14259
diff changeset
  1248
        if (!t.hasTag(ERROR))
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1249
            return t;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1250
21015
f3bec12a63e7 6278240: Exception from AnnotationValue.getValue() should list the found type not the required type
jlahoda
parents: 21010
diff changeset
  1251
        return new ErrorType(t.getOriginalType(), t.tsym) {
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1252
            private Type modelType;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1253
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1254
            @Override
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1255
            public Type getModelType() {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1256
                if (modelType == null)
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1257
                    modelType = new Synthesizer(getOriginalType(), interfaceExpected).visit(tree);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1258
                return modelType;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1259
            }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1260
        };
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1261
    }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1262
    // where
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1263
    private class Synthesizer extends JCTree.Visitor {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1264
        Type originalType;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1265
        boolean interfaceExpected;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1266
        List<ClassSymbol> synthesizedSymbols = List.nil();
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1267
        Type result;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1268
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1269
        Synthesizer(Type originalType, boolean interfaceExpected) {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1270
            this.originalType = originalType;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1271
            this.interfaceExpected = interfaceExpected;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1272
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1273
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1274
        Type visit(JCTree tree) {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1275
            tree.accept(this);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1276
            return result;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1277
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1278
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1279
        List<Type> visit(List<? extends JCTree> trees) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21498
diff changeset
  1280
            ListBuffer<Type> lb = new ListBuffer<>();
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1281
            for (JCTree t: trees)
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1282
                lb.append(visit(t));
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1283
            return lb.toList();
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1284
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1285
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1286
        @Override
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1287
        public void visitTree(JCTree tree) {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1288
            result = syms.errType;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1289
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1290
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1291
        @Override
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1292
        public void visitIdent(JCIdent tree) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14259
diff changeset
  1293
            if (!tree.type.hasTag(ERROR)) {
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1294
                result = tree.type;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1295
            } else {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1296
                result = synthesizeClass(tree.name, syms.unnamedPackage).type;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1297
            }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1298
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1299
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1300
        @Override
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1301
        public void visitSelect(JCFieldAccess tree) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14259
diff changeset
  1302
            if (!tree.type.hasTag(ERROR)) {
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1303
                result = tree.type;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1304
            } else {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1305
                Type selectedType;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1306
                boolean prev = interfaceExpected;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1307
                try {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1308
                    interfaceExpected = false;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1309
                    selectedType = visit(tree.selected);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1310
                } finally {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1311
                    interfaceExpected = prev;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1312
                }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1313
                ClassSymbol c = synthesizeClass(tree.name, selectedType.tsym);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1314
                result = c.type;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1315
            }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1316
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1317
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1318
        @Override
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1319
        public void visitTypeApply(JCTypeApply tree) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14259
diff changeset
  1320
            if (!tree.type.hasTag(ERROR)) {
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1321
                result = tree.type;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1322
            } else {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1323
                ClassType clazzType = (ClassType) visit(tree.clazz);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1324
                if (synthesizedSymbols.contains(clazzType.tsym))
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1325
                    synthesizeTyparams((ClassSymbol) clazzType.tsym, tree.arguments.size());
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1326
                final List<Type> actuals = visit(tree.arguments);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1327
                result = new ErrorType(tree.type, clazzType.tsym) {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1328
                    @Override
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1329
                    public List<Type> getTypeArguments() {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1330
                        return actuals;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1331
                    }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1332
                };
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1333
            }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1334
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1335
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1336
        ClassSymbol synthesizeClass(Name name, Symbol owner) {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1337
            int flags = interfaceExpected ? INTERFACE : 0;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1338
            ClassSymbol c = new ClassSymbol(flags, name, owner);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1339
            c.members_field = new Scope.ErrorScope(c);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1340
            c.type = new ErrorType(originalType, c) {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1341
                @Override
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1342
                public List<Type> getTypeArguments() {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1343
                    return typarams_field;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1344
                }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1345
            };
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1346
            synthesizedSymbols = synthesizedSymbols.prepend(c);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1347
            return c;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1348
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1349
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1350
        void synthesizeTyparams(ClassSymbol sym, int n) {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1351
            ClassType ct = (ClassType) sym.type;
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1352
            Assert.check(ct.typarams_field.isEmpty());
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1353
            if (n == 1) {
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
  1354
                TypeVar v = new TypeVar(names.fromString("T"), sym, syms.botType,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
  1355
                                        Type.noAnnotations);
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1356
                ct.typarams_field = ct.typarams_field.prepend(v);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1357
            } else {
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1358
                for (int i = n; i > 0; i--) {
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
  1359
                    TypeVar v = new TypeVar(names.fromString("T" + i), sym,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
  1360
                                            syms.botType, Type.noAnnotations);
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1361
                    ct.typarams_field = ct.typarams_field.prepend(v);
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1362
                }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1363
            }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1364
        }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1365
    }
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1366
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8242
diff changeset
  1367
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1368
/* ***************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1369
 * tree building
06bc494ca11e Initial load
duke
parents:
diff changeset
  1370
 ****************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1371
06bc494ca11e Initial load
duke
parents:
diff changeset
  1372
    /** Generate default constructor for given class. For classes different
06bc494ca11e Initial load
duke
parents:
diff changeset
  1373
     *  from java.lang.Object, this is:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1374
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1375
     *    c(argtype_0 x_0, ..., argtype_n x_n) throws thrown {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1376
     *      super(x_0, ..., x_n)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1377
     *    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1378
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1379
     *  or, if based == true:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1380
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1381
     *    c(argtype_0 x_0, ..., argtype_n x_n) throws thrown {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1382
     *      x_0.super(x_1, ..., x_n)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1383
     *    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1384
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1385
     *  @param make     The tree factory.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1386
     *  @param c        The class owning the default constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1387
     *  @param argtypes The parameter types of the constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1388
     *  @param thrown   The thrown exceptions of the constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1389
     *  @param based    Is first parameter a this$n?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1390
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1391
    JCTree DefaultConstructor(TreeMaker make,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1392
                            ClassSymbol c,
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1393
                            MethodSymbol baseInit,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1394
                            List<Type> typarams,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1395
                            List<Type> argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1396
                            List<Type> thrown,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1397
                            long flags,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1398
                            boolean based) {
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1399
        JCTree result;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1400
        if ((c.flags() & ENUM) != 0 &&
16558
07c08ad4a700 8010179: Remove transitional target values from javac
darcy
parents: 15720
diff changeset
  1401
            (types.supertype(c.type).tsym == syms.enumSym)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1402
            // constructors of true enums are private
06bc494ca11e Initial load
duke
parents:
diff changeset
  1403
            flags = (flags & ~AccessFlags) | PRIVATE | GENERATEDCONSTR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1404
        } else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1405
            flags |= (c.flags() & AccessFlags) | GENERATEDCONSTR;
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1406
        if (c.name.isEmpty()) {
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1407
            flags |= ANONCONSTR;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1408
        }
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1409
        Type mType = new MethodType(argtypes, null, thrown, c);
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1410
        Type initType = typarams.nonEmpty() ?
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
  1411
            new ForAll(typarams, mType) :
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24069
diff changeset
  1412
            mType;
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1413
        MethodSymbol init = new MethodSymbol(flags, names.init,
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1414
                initType, c);
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1415
        init.params = createDefaultConstructorParams(make, baseInit, init,
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1416
                argtypes, based);
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1417
        List<JCVariableDecl> params = make.Params(argtypes, init);
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1418
        List<JCStatement> stats = List.nil();
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1419
        if (c.type != syms.objectType) {
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1420
            stats = stats.prepend(SuperCall(make, typarams, params, based));
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1421
        }
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1422
        result = make.MethodDef(init, make.Block(0, stats));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1423
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1424
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1425
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1426
    private List<VarSymbol> createDefaultConstructorParams(
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1427
            TreeMaker make,
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1428
            MethodSymbol baseInit,
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1429
            MethodSymbol init,
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1430
            List<Type> argtypes,
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1431
            boolean based) {
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1432
        List<VarSymbol> initParams = null;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1433
        List<Type> argTypesList = argtypes;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1434
        if (based) {
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1435
            /*  In this case argtypes will have an extra type, compared to baseInit,
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1436
             *  corresponding to the type of the enclosing instance i.e.:
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1437
             *
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1438
             *  Inner i = outer.new Inner(1){}
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1439
             *
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1440
             *  in the above example argtypes will be (Outer, int) and baseInit
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1441
             *  will have parameter's types (int). So in this case we have to add
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1442
             *  first the extra type in argtypes and then get the names of the
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1443
             *  parameters from baseInit.
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1444
             */
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1445
            initParams = List.nil();
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19656
diff changeset
  1446
            VarSymbol param = new VarSymbol(PARAMETER, make.paramName(0), argtypes.head, init);
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1447
            initParams = initParams.append(param);
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1448
            argTypesList = argTypesList.tail;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1449
        }
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1450
        if (baseInit != null && baseInit.params != null &&
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1451
            baseInit.params.nonEmpty() && argTypesList.nonEmpty()) {
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1452
            initParams = (initParams == null) ? List.<VarSymbol>nil() : initParams;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1453
            List<VarSymbol> baseInitParams = baseInit.params;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1454
            while (baseInitParams.nonEmpty() && argTypesList.nonEmpty()) {
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19656
diff changeset
  1455
                VarSymbol param = new VarSymbol(baseInitParams.head.flags() | PARAMETER,
17999
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1456
                        baseInitParams.head.name, argTypesList.head, init);
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1457
                initParams = initParams.append(param);
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1458
                baseInitParams = baseInitParams.tail;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1459
                argTypesList = argTypesList.tail;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1460
            }
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1461
        }
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1462
        return initParams;
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1463
    }
42ae6fe53718 8010737: javac, known parameter's names should be copied to automatically generated constructors for inner classes
vromero
parents: 17578
diff changeset
  1464
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1465
    /** Generate call to superclass constructor. This is:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1466
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1467
     *    super(id_0, ..., id_n)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1468
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1469
     * or, if based == true
06bc494ca11e Initial load
duke
parents:
diff changeset
  1470
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1471
     *    id_0.super(id_1,...,id_n)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1472
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1473
     *  where id_0, ..., id_n are the names of the given parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1474
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1475
     *  @param make    The tree factory
06bc494ca11e Initial load
duke
parents:
diff changeset
  1476
     *  @param params  The parameters that need to be passed to super
06bc494ca11e Initial load
duke
parents:
diff changeset
  1477
     *  @param typarams  The type parameters that need to be passed to super
06bc494ca11e Initial load
duke
parents:
diff changeset
  1478
     *  @param based   Is first parameter a this$n?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1479
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1480
    JCExpressionStatement SuperCall(TreeMaker make,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1481
                   List<Type> typarams,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1482
                   List<JCVariableDecl> params,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1483
                   boolean based) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1484
        JCExpression meth;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1485
        if (based) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1486
            meth = make.Select(make.Ident(params.head), names._super);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1487
            params = params.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1488
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1489
            meth = make.Ident(names._super);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1490
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1491
        List<JCExpression> typeargs = typarams.nonEmpty() ? make.Types(typarams) : null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1492
        return make.Exec(make.Apply(typeargs, meth, make.Idents(params)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1493
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1494
}