src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
author sadayapalam
Fri, 30 Nov 2018 10:37:48 +0530
changeset 52777 7d3391e9df19
parent 52278 e11a53698d57
child 58713 ad69fd32778e
permissions -rw-r--r--
8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata Reviewed-by: mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
43143
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
     2
 * Copyright (c) 2003, 2017, 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: 1264
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: 1264
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: 1264
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 1264
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 1264
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
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    28
import com.sun.tools.javac.code.*;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    29
import com.sun.tools.javac.code.Attribute.Compound;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    30
import com.sun.tools.javac.code.Attribute.TypeCompound;
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
    31
import com.sun.tools.javac.code.Kinds.KindSelector;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    32
import com.sun.tools.javac.code.Scope.WriteableScope;
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47268
diff changeset
    33
import com.sun.tools.javac.code.Source.Feature;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    34
import com.sun.tools.javac.code.Symbol.*;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    35
import com.sun.tools.javac.code.TypeMetadata.Entry.Kind;
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
    36
import com.sun.tools.javac.comp.Check.CheckContext;
29960
d20c04ed8ffe 8043984: Confusing (incorrect) error message on repeatable annotations
alundblad
parents: 29842
diff changeset
    37
import com.sun.tools.javac.resources.CompilerProperties.Errors;
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47268
diff changeset
    38
import com.sun.tools.javac.resources.CompilerProperties.Fragments;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    39
import com.sun.tools.javac.tree.JCTree;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    40
import com.sun.tools.javac.tree.JCTree.*;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    41
import com.sun.tools.javac.tree.TreeInfo;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    42
import com.sun.tools.javac.tree.TreeMaker;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    43
import com.sun.tools.javac.tree.TreeScanner;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    44
import com.sun.tools.javac.util.*;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    45
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    46
import com.sun.tools.javac.util.List;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
    47
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
    48
import javax.tools.JavaFileObject;
45500
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
    49
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    50
import java.util.*;
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
    51
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    52
import static com.sun.tools.javac.code.Flags.SYNTHETIC;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41637
diff changeset
    53
import static com.sun.tools.javac.code.Kinds.Kind.MDL;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    54
import static com.sun.tools.javac.code.Kinds.Kind.MTH;
43143
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
    55
import static com.sun.tools.javac.code.Kinds.Kind.PCK;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    56
import static com.sun.tools.javac.code.Kinds.Kind.VAR;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    57
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: 14054
diff changeset
    58
import static com.sun.tools.javac.code.TypeTag.ARRAY;
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14054
diff changeset
    59
import static com.sun.tools.javac.code.TypeTag.CLASS;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    60
import static com.sun.tools.javac.tree.JCTree.Tag.ANNOTATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    61
import static com.sun.tools.javac.tree.JCTree.Tag.ASSIGN;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    62
import static com.sun.tools.javac.tree.JCTree.Tag.IDENT;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    63
import static com.sun.tools.javac.tree.JCTree.Tag.NEWARRAY;
45500
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
    64
40504
0a01f6710c84 8078561: Error message should be generated once when -source 6 is specified
jlahoda
parents: 34762
diff changeset
    65
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 9603
diff changeset
    66
45500
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
    67
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    68
/** Enter annotations onto symbols and types (and trees).
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    69
 *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    70
 *  This is also a pseudo stage in the compiler taking care of scheduling when annotations are
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    71
 *  entered.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    73
 *  <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
    74
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    75
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    78
public class Annotate {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21713
diff changeset
    79
    protected static final Context.Key<Annotate> annotateKey = new Context.Key<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
    public static Annotate instance(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
        Annotate instance = context.get(annotateKey);
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
        if (instance == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
            instance = new Annotate(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
    85
        return instance;
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
    88
    private final Attr attr;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    89
    private final Check chk;
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
    90
    private final ConstFold cfolder;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    91
    private final DeferredLintHandler deferredLintHandler;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    92
    private final Enter enter;
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
    93
    private final Lint lint;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    94
    private final Log log;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    95
    private final Names names;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    96
    private final Resolve resolve;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    97
    private final TreeMaker make;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    98
    private final Symtab syms;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    99
    private final TypeEnvs typeEnvs;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   100
    private final Types types;
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
   101
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   102
    private final Attribute theUnfinishedDefaultValue;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   103
    private final boolean allowRepeatedAnnos;
41031
9075bf88387b 8138822: Source version error missing version number
dlsmith
parents: 40504
diff changeset
   104
    private final String sourceName;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   105
06bc494ca11e Initial load
duke
parents:
diff changeset
   106
    protected Annotate(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   107
        context.put(annotateKey, this);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   108
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   109
        attr = Attr.instance(context);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   110
        chk = Check.instance(context);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   111
        cfolder = ConstFold.instance(context);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   112
        deferredLintHandler = DeferredLintHandler.instance(context);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   113
        enter = Enter.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   114
        log = Log.instance(context);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   115
        lint = Lint.instance(context);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   116
        make = TreeMaker.instance(context);
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 10
diff changeset
   117
        names = Names.instance(context);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   118
        resolve = Resolve.instance(context);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   119
        syms = Symtab.instance(context);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   120
        typeEnvs = TypeEnvs.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   121
        types = Types.instance(context);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   122
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   123
        theUnfinishedDefaultValue =  new Attribute.Error(syms.errType);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   124
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   125
        Source source = Source.instance(context);
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47268
diff changeset
   126
        allowRepeatedAnnos = Feature.REPEATED_ANNOTATIONS.allowedInSource(source);
41031
9075bf88387b 8138822: Source version error missing version number
dlsmith
parents: 40504
diff changeset
   127
        sourceName = source.name;
43269
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
   128
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
   129
        blockCount = 1;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   130
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   131
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   132
    /** Semaphore to delay annotation processing */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   133
    private int blockCount = 0;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   134
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   135
    /** Called when annotations processing needs to be postponed. */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   136
    public void blockAnnotations() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   137
        blockCount++;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   138
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   139
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   140
    /** Called when annotation processing can be resumed. */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   141
    public void unblockAnnotations() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   142
        blockCount--;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   143
        if (blockCount == 0)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   144
            flush();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   145
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   146
21043
3b000be15694 8026286: Improper locking of annotation queues causes assertion failures.
emc
parents: 21041
diff changeset
   147
    /** Variant which allows for a delayed flush of annotations.
3b000be15694 8026286: Improper locking of annotation queues causes assertion failures.
emc
parents: 21041
diff changeset
   148
     * Needed by ClassReader */
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   149
    public void unblockAnnotationsNoFlush() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   150
        blockCount--;
21043
3b000be15694 8026286: Improper locking of annotation queues causes assertion failures.
emc
parents: 21041
diff changeset
   151
    }
3b000be15694 8026286: Improper locking of annotation queues causes assertion failures.
emc
parents: 21041
diff changeset
   152
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   153
    /** are we blocking annotation processing? */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   154
    public boolean annotationsBlocked() {return blockCount > 0; }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   155
43269
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
   156
    public void enterDone() {
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
   157
        unblockAnnotations();
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
   158
    }
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
   159
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   160
    public List<TypeCompound> fromAnnotations(List<JCAnnotation> annotations) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   161
        if (annotations.isEmpty()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   162
            return List.nil();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   163
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   164
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   165
        ListBuffer<TypeCompound> buf = new ListBuffer<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   166
        for (JCAnnotation anno : annotations) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   167
            Assert.checkNonNull(anno.attribute);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   168
            buf.append((TypeCompound) anno.attribute);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   169
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   170
        return buf.toList();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   171
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   172
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   173
    /** Annotate (used for everything else) */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   174
    public void normal(Runnable r) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   175
        q.append(r);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   176
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   177
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   178
    /** Validate, triggers after 'normal' */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   179
    public void validate(Runnable a) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   180
        validateQ.append(a);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   181
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   182
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   183
    /** Flush all annotation queues */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   184
    public void flush() {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   185
        if (annotationsBlocked()) return;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   186
        if (isFlushing()) return;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   187
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   188
        startFlushing();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   189
        try {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   190
            while (q.nonEmpty()) {
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21018
diff changeset
   191
                q.next().run();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   192
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   193
            while (typesQ.nonEmpty()) {
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21018
diff changeset
   194
                typesQ.next().run();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   195
            }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   196
            while (afterTypesQ.nonEmpty()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   197
                afterTypesQ.next().run();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   198
            }
21018
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   199
            while (validateQ.nonEmpty()) {
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21018
diff changeset
   200
                validateQ.next().run();
21018
95d225149128 8014016: javac is too late detecting invalid annotation usage
jlahoda
parents: 21015
diff changeset
   201
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   202
        } finally {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   203
            doneFlushing();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   204
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   205
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   206
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   207
    private ListBuffer<Runnable> q = new ListBuffer<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   208
    private ListBuffer<Runnable> validateQ = new ListBuffer<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   209
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   210
    private int flushCount = 0;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   211
    private boolean isFlushing() { return flushCount > 0; }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   212
    private void startFlushing() { flushCount++; }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   213
    private void doneFlushing() { flushCount--; }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   214
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   215
    ListBuffer<Runnable> typesQ = new ListBuffer<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   216
    ListBuffer<Runnable> afterTypesQ = new ListBuffer<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   217
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   218
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   219
    public void typeAnnotation(Runnable a) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   220
        typesQ.append(a);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   221
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   222
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   223
    public void afterTypes(Runnable a) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   224
        afterTypesQ.append(a);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   225
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   226
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   227
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   228
     * Queue annotations for later attribution and entering. This is probably the method you are looking for.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   229
     *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   230
     * @param annotations the list of JCAnnotations to attribute and enter
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   231
     * @param localEnv    the enclosing env
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   232
     * @param s           ths Symbol on which to enter the annotations
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   233
     * @param deferPos    report errors here
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   234
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   235
    public void annotateLater(List<JCAnnotation> annotations, Env<AttrContext> localEnv,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   236
            Symbol s, DiagnosticPosition deferPos)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   237
    {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   238
        if (annotations.isEmpty()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   239
            return;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   240
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   241
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   242
        s.resetAnnotations(); // mark Annotations as incomplete for now
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   243
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   244
        normal(() -> {
43143
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   245
            // Packages are unusual, in that they are the only type of declaration that can legally appear
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   246
            // more than once in a compilation, and in all cases refer to the same underlying symbol.
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   247
            // This means they are the only kind of declaration that syntactically may have multiple sets
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   248
            // of annotations, each on a different package declaration, even though that is ultimately
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   249
            // forbidden by JLS 8 section 7.4.
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   250
            // The corollary here is that all of the annotations on a package symbol may have already
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   251
            // been handled, meaning that the set of annotations pending completion is now empty.
a8f5cdfa330a 8171528: Crash in Annotate with duplicate package-info declarations
vromero
parents: 42828
diff changeset
   252
            Assert.check(s.kind == PCK || s.annotationsPendingCompletion());
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   253
            JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   254
            DiagnosticPosition prevLintPos =
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   255
                    deferPos != null
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   256
                            ? deferredLintHandler.setPos(deferPos)
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   257
                            : deferredLintHandler.immediate();
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   258
            Lint prevLint = deferPos != null ? null : chk.setLint(lint);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   259
            try {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   260
                if (s.hasAnnotations() && annotations.nonEmpty())
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   261
                    log.error(annotations.head.pos, Errors.AlreadyAnnotated(Kinds.kindName(s), s));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   262
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   263
                Assert.checkNonNull(s, "Symbol argument to actualEnterAnnotations is null");
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   264
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   265
                // false is passed as fifth parameter since annotateLater is
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   266
                // never called for a type parameter
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   267
                annotateNow(s, annotations, localEnv, false, false);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   268
            } finally {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   269
                if (prevLint != null)
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   270
                    chk.setLint(prevLint);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   271
                deferredLintHandler.setPos(prevLintPos);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   272
                log.useSource(prev);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   273
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   274
        });
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   275
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   276
        validate(() -> { //validate annotations
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   277
            JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   278
            try {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   279
                chk.validateAnnotations(annotations, s);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   280
            } finally {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   281
                log.useSource(prev);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   282
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   283
        });
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   284
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   285
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   286
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   287
    /** Queue processing of an attribute default value. */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   288
    public void annotateDefaultValueLater(JCExpression defaultValue, Env<AttrContext> localEnv,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   289
            MethodSymbol m, DiagnosticPosition deferPos)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   290
    {
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   291
        normal(() -> {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   292
            JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   293
            DiagnosticPosition prevLintPos = deferredLintHandler.setPos(deferPos);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   294
            try {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   295
                enterDefaultValue(defaultValue, localEnv, m);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   296
            } finally {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   297
                deferredLintHandler.setPos(prevLintPos);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   298
                log.useSource(prev);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   299
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   300
        });
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   301
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   302
        validate(() -> { //validate annotations
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   303
            JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   304
            try {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   305
                // if default value is an annotation, check it is a well-formed
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   306
                // annotation value (e.g. no duplicate values, no missing values, etc.)
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   307
                chk.validateAnnotationTree(defaultValue);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   308
            } finally {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
   309
                log.useSource(prev);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   310
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   311
        });
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   312
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   313
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   314
    /** Enter a default value for an annotation element. */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   315
    private void enterDefaultValue(JCExpression defaultValue,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   316
            Env<AttrContext> localEnv, MethodSymbol m) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   317
        m.defaultValue = attributeAnnotationValue(m.type.getReturnType(), defaultValue, localEnv);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   318
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   319
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   320
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   321
     * Gather up annotations into a map from type symbols to lists of Compound attributes,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   322
     * then continue on with repeating annotations processing.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   323
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   324
    private <T extends Attribute.Compound> void annotateNow(Symbol toAnnotate,
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   325
            List<JCAnnotation> withAnnotations, Env<AttrContext> env, boolean typeAnnotations,
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   326
            boolean isTypeParam)
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   327
    {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   328
        Map<TypeSymbol, ListBuffer<T>> annotated = new LinkedHashMap<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   329
        Map<T, DiagnosticPosition> pos = new HashMap<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   330
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   331
        for (List<JCAnnotation> al = withAnnotations; !al.isEmpty(); al = al.tail) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   332
            JCAnnotation a = al.head;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   333
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   334
            T c;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   335
            if (typeAnnotations) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   336
                @SuppressWarnings("unchecked")
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   337
                T tmp = (T)attributeTypeAnnotation(a, syms.annotationType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   338
                c = tmp;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   339
            } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   340
                @SuppressWarnings("unchecked")
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   341
                T tmp = (T)attributeAnnotation(a, syms.annotationType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   342
                c = tmp;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   343
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   344
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   345
            Assert.checkNonNull(c, "Failed to create annotation");
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   346
52777
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   347
            if (a.type.tsym.isAnnotationType()) {
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   348
                if (annotated.containsKey(a.type.tsym)) {
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   349
                    if (!allowRepeatedAnnos) {
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   350
                        log.error(DiagnosticFlag.SOURCE_LEVEL, a.pos(), Feature.REPEATED_ANNOTATIONS.error(sourceName));
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   351
                    }
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   352
                    ListBuffer<T> l = annotated.get(a.type.tsym);
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   353
                    l = l.append(c);
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   354
                    annotated.put(a.type.tsym, l);
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   355
                    pos.put(c, a.pos());
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   356
                } else {
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   357
                    annotated.put(a.type.tsym, ListBuffer.of(c));
7d3391e9df19 8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata
sadayapalam
parents: 52278
diff changeset
   358
                    pos.put(c, a.pos());
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   359
                }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   360
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   361
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   362
            // Note: @Deprecated has no effect on local variables and parameters
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   363
            if (!c.type.isErroneous()
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41637
diff changeset
   364
                    && (toAnnotate.kind == MDL || toAnnotate.owner.kind != MTH)
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   365
                    && types.isSameType(c.type, syms.deprecatedType)) {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41637
diff changeset
   366
                toAnnotate.flags_field |= (Flags.DEPRECATED | Flags.DEPRECATED_ANNOTATION);
41637
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41031
diff changeset
   367
                Attribute fr = c.member(names.forRemoval);
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41031
diff changeset
   368
                if (fr instanceof Attribute.Constant) {
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41031
diff changeset
   369
                    Attribute.Constant v = (Attribute.Constant) fr;
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41031
diff changeset
   370
                    if (v.type == syms.booleanType && ((Integer) v.value) != 0) {
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41031
diff changeset
   371
                        toAnnotate.flags_field |= Flags.DEPRECATED_REMOVAL;
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41031
diff changeset
   372
                    }
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41031
diff changeset
   373
                }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   374
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   375
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   376
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   377
        List<T> buf = List.nil();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   378
        for (ListBuffer<T> lb : annotated.values()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   379
            if (lb.size() == 1) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   380
                buf = buf.prepend(lb.first());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   381
            } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   382
                AnnotationContext<T> ctx = new AnnotationContext<>(env, annotated, pos, typeAnnotations);
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   383
                T res = makeContainerAnnotation(lb.toList(), ctx, toAnnotate, isTypeParam);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   384
                if (res != null)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   385
                    buf = buf.prepend(res);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   386
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   387
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   388
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   389
        if (typeAnnotations) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   390
            @SuppressWarnings("unchecked")
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   391
            List<TypeCompound> attrs = (List<TypeCompound>)buf.reverse();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   392
            toAnnotate.appendUniqueTypeAttributes(attrs);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   393
        } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   394
            @SuppressWarnings("unchecked")
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   395
            List<Attribute.Compound> attrs =  (List<Attribute.Compound>)buf.reverse();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   396
            toAnnotate.resetAnnotations();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   397
            toAnnotate.setDeclarationAttributes(attrs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   398
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   399
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   400
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   401
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   402
     * Attribute and store a semantic representation of the annotation tree {@code tree} into the
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   403
     * tree.attribute field.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   404
     *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   405
     * @param tree the tree representing an annotation
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   406
     * @param expectedAnnotationType the expected (super)type of the annotation
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   407
     * @param env the current env in where the annotation instance is found
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   408
     */
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   409
    public Attribute.Compound attributeAnnotation(JCAnnotation tree, Type expectedAnnotationType,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   410
                                                  Env<AttrContext> env)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   411
    {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   412
        // The attribute might have been entered if it is Target or Repetable
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   413
        // Because TreeCopier does not copy type, redo this if type is null
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   414
        if (tree.attribute != null && tree.type != null)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   415
            return tree.attribute;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   416
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   417
        List<Pair<MethodSymbol, Attribute>> elems = attributeAnnotationValues(tree, expectedAnnotationType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   418
        Attribute.Compound ac = new Attribute.Compound(tree.type, elems);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   419
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   420
        return tree.attribute = ac;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   421
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   422
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   423
    /** Attribute and store a semantic representation of the type annotation tree {@code tree} into
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   424
     * the tree.attribute field.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   425
     *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   426
     * @param a the tree representing an annotation
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   427
     * @param expectedAnnotationType the expected (super)type of the annotation
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   428
     * @param env the the current env in where the annotation instance is found
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   429
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   430
    public Attribute.TypeCompound attributeTypeAnnotation(JCAnnotation a, Type expectedAnnotationType,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   431
                                                          Env<AttrContext> env)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   432
    {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   433
        // The attribute might have been entered if it is Target or Repetable
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   434
        // Because TreeCopier does not copy type, redo this if type is null
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   435
        if (a.attribute == null || a.type == null || !(a.attribute instanceof Attribute.TypeCompound)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   436
            // Create a new TypeCompound
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   437
            List<Pair<MethodSymbol,Attribute>> elems =
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   438
                    attributeAnnotationValues(a, expectedAnnotationType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   439
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   440
            Attribute.TypeCompound tc =
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   441
                    new Attribute.TypeCompound(a.type, elems, TypeAnnotationPosition.unknown);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   442
            a.attribute = tc;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   443
            return tc;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   444
        } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   445
            // Use an existing TypeCompound
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   446
            return (Attribute.TypeCompound)a.attribute;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   447
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   448
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   449
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   450
    /**
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   451
     *  Attribute annotation elements creating a list of pairs of the Symbol representing that
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   452
     *  element and the value of that element as an Attribute. */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   453
    private List<Pair<MethodSymbol, Attribute>> attributeAnnotationValues(JCAnnotation a,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   454
            Type expected, Env<AttrContext> env)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   455
    {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   456
        // The annotation might have had its type attributed (but not
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   457
        // checked) by attr.attribAnnotationTypes during MemberEnter,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   458
        // in which case we do not need to do it again.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   459
        Type at = (a.annotationType.type != null ?
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   460
                a.annotationType.type : attr.attribType(a.annotationType, env));
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   461
        a.type = chk.checkType(a.annotationType.pos(), at, expected);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   462
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   463
        boolean isError = a.type.isErroneous();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   464
        if (!a.type.tsym.isAnnotationType() && !isError) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   465
            log.error(a.annotationType.pos(), Errors.NotAnnotationType(a.type));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   466
            isError = true;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   467
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   468
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   469
        // List of name=value pairs (or implicit "value=" if size 1)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   470
        List<JCExpression> args = a.args;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   471
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   472
        boolean elidedValue = false;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   473
        // special case: elided "value=" assumed
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   474
        if (args.length() == 1 && !args.head.hasTag(ASSIGN)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   475
            args.head = make.at(args.head.pos).
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   476
                    Assign(make.Ident(names.value), args.head);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   477
            elidedValue = true;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   478
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   479
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   480
        ListBuffer<Pair<MethodSymbol,Attribute>> buf = new ListBuffer<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   481
        for (List<JCExpression> tl = args; tl.nonEmpty(); tl = tl.tail) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   482
            Pair<MethodSymbol, Attribute> p = attributeAnnotationNameValuePair(tl.head, a.type, isError, env, elidedValue);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   483
            if (p != null && !p.fst.type.isErroneous())
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   484
                buf.append(p);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   485
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   486
        return buf.toList();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   487
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   488
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   489
    // where
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   490
    private Pair<MethodSymbol, Attribute> attributeAnnotationNameValuePair(JCExpression nameValuePair,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   491
            Type thisAnnotationType, boolean badAnnotation, Env<AttrContext> env, boolean elidedValue)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   492
    {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   493
        if (!nameValuePair.hasTag(ASSIGN)) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   494
            log.error(nameValuePair.pos(), Errors.AnnotationValueMustBeNameValue);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   495
            attributeAnnotationValue(nameValuePair.type = syms.errType, nameValuePair, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   496
            return null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   497
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   498
        JCAssign assign = (JCAssign)nameValuePair;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   499
        if (!assign.lhs.hasTag(IDENT)) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   500
            log.error(nameValuePair.pos(), Errors.AnnotationValueMustBeNameValue);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   501
            attributeAnnotationValue(nameValuePair.type = syms.errType, nameValuePair, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   502
            return null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   503
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   504
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   505
        // Resolve element to MethodSym
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   506
        JCIdent left = (JCIdent)assign.lhs;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   507
        Symbol method = resolve.resolveQualifiedMethod(elidedValue ? assign.rhs.pos() : left.pos(),
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   508
                env, thisAnnotationType,
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42407
diff changeset
   509
                left.name, List.nil(), null);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   510
        left.sym = method;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   511
        left.type = method.type;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   512
        if (method.owner != thisAnnotationType.tsym && !badAnnotation)
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   513
            log.error(left.pos(), Errors.NoAnnotationMember(left.name, thisAnnotationType));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   514
        Type resultType = method.type.getReturnType();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   515
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   516
        // Compute value part
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   517
        Attribute value = attributeAnnotationValue(resultType, assign.rhs, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   518
        nameValuePair.type = resultType;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   519
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   520
        return method.type.isErroneous() ? null : new Pair<>((MethodSymbol)method, value);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   521
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   522
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   523
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   524
    /** Attribute an annotation element value */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   525
    private Attribute attributeAnnotationValue(Type expectedElementType, JCExpression tree,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   526
            Env<AttrContext> env)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   527
    {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   528
        //first, try completing the symbol for the annotation value - if acompletion
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   529
        //error is thrown, we should recover gracefully, and display an
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   530
        //ordinary resolution diagnostic.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   531
        try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   532
            expectedElementType.tsym.complete();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   533
        } catch(CompletionFailure e) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   534
            log.error(tree.pos(), Errors.CantResolve(Kinds.kindName(e.sym), e.sym.getQualifiedName(), null, null));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   535
            expectedElementType = syms.errType;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   536
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   537
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   538
        if (expectedElementType.hasTag(ARRAY)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   539
            return getAnnotationArrayValue(expectedElementType, tree, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   540
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   541
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   542
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   543
        //error recovery
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   544
        if (tree.hasTag(NEWARRAY)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   545
            if (!expectedElementType.isErroneous())
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   546
                log.error(tree.pos(), Errors.AnnotationValueNotAllowableType);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   547
            JCNewArray na = (JCNewArray)tree;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   548
            if (na.elemtype != null) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   549
                log.error(na.elemtype.pos(), Errors.NewNotAllowedInAnnotation);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   550
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   551
            for (List<JCExpression> l = na.elems; l.nonEmpty(); l=l.tail) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   552
                attributeAnnotationValue(syms.errType,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   553
                        l.head,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   554
                        env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   555
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   556
            return new Attribute.Error(syms.errType);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   557
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   558
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   559
        if (expectedElementType.tsym.isAnnotationType()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   560
            if (tree.hasTag(ANNOTATION)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   561
                return attributeAnnotation((JCAnnotation)tree, expectedElementType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   562
            } else {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   563
                log.error(tree.pos(), Errors.AnnotationValueMustBeAnnotation);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   564
                expectedElementType = syms.errType;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   565
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   566
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   567
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   568
        //error recovery
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   569
        if (tree.hasTag(ANNOTATION)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   570
            if (!expectedElementType.isErroneous())
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   571
                log.error(tree.pos(), Errors.AnnotationNotValidForType(expectedElementType));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   572
            attributeAnnotation((JCAnnotation)tree, syms.errType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   573
            return new Attribute.Error(((JCAnnotation)tree).annotationType.type);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   574
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   575
45500
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   576
        MemberEnter.InitTreeVisitor initTreeVisitor = new MemberEnter.InitTreeVisitor() {
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   577
            // the methods below are added to allow class literals on top of constant expressions
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   578
            @Override
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   579
            public void visitTypeIdent(JCPrimitiveTypeTree that) {}
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   580
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   581
            @Override
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   582
            public void visitTypeArray(JCArrayTypeTree that) {}
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   583
        };
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   584
        tree.accept(initTreeVisitor);
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   585
        if (!initTreeVisitor.result) {
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   586
            log.error(tree.pos(), Errors.ExpressionNotAllowableAsAnnotationValue);
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   587
            return new Attribute.Error(syms.errType);
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   588
        }
365640343c55 8181464: Invalid lambda in annotation causes NPE in Lint.augment
vromero
parents: 43269
diff changeset
   589
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   590
        if (expectedElementType.isPrimitive() ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   591
                (types.isSameType(expectedElementType, syms.stringType) && !expectedElementType.hasTag(TypeTag.ERROR))) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   592
            return getAnnotationPrimitiveValue(expectedElementType, tree, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   593
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   594
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   595
        if (expectedElementType.tsym == syms.classType.tsym) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   596
            return getAnnotationClassValue(expectedElementType, tree, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   597
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   598
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   599
        if (expectedElementType.hasTag(CLASS) &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   600
                (expectedElementType.tsym.flags() & Flags.ENUM) != 0) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   601
            return getAnnotationEnumValue(expectedElementType, tree, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   602
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   603
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   604
        //error recovery:
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   605
        if (!expectedElementType.isErroneous())
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   606
            log.error(tree.pos(), Errors.AnnotationValueNotAllowableType);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   607
        return new Attribute.Error(attr.attribExpr(tree, env, expectedElementType));
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   608
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   609
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   610
    private Attribute getAnnotationEnumValue(Type expectedElementType, JCExpression tree, Env<AttrContext> env) {
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   611
        Type result = attr.attribTree(tree, env, annotationValueInfo(expectedElementType));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   612
        Symbol sym = TreeInfo.symbol(tree);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   613
        if (sym == null ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   614
                TreeInfo.nonstaticSelect(tree) ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   615
                sym.kind != VAR ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   616
                (sym.flags() & Flags.ENUM) == 0) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   617
            log.error(tree.pos(), Errors.EnumAnnotationMustBeEnumConstant);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   618
            return new Attribute.Error(result.getOriginalType());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   619
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   620
        VarSymbol enumerator = (VarSymbol) sym;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   621
        return new Attribute.Enum(expectedElementType, enumerator);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   622
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   623
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   624
    private Attribute getAnnotationClassValue(Type expectedElementType, JCExpression tree, Env<AttrContext> env) {
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   625
        Type result = attr.attribTree(tree, env, annotationValueInfo(expectedElementType));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   626
        if (result.isErroneous()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   627
            // Does it look like an unresolved class literal?
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   628
            if (TreeInfo.name(tree) == names._class &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   629
                    ((JCFieldAccess) tree).selected.type.isErroneous()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   630
                Name n = (((JCFieldAccess) tree).selected).type.tsym.flatName();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   631
                return new Attribute.UnresolvedClass(expectedElementType,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   632
                        types.createErrorType(n,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   633
                                syms.unknownSymbol, syms.classType));
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   634
            } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   635
                return new Attribute.Error(result.getOriginalType());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   636
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   637
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   638
45753
567c159ce16f 8182747: javac crashes on bad annotation value
vromero
parents: 45504
diff changeset
   639
        // Class literals look like field accesses of a field named class
567c159ce16f 8182747: javac crashes on bad annotation value
vromero
parents: 45504
diff changeset
   640
        // at the tree level
567c159ce16f 8182747: javac crashes on bad annotation value
vromero
parents: 45504
diff changeset
   641
        if (TreeInfo.name(tree) != names._class) {
567c159ce16f 8182747: javac crashes on bad annotation value
vromero
parents: 45504
diff changeset
   642
            log.error(tree.pos(), Errors.AnnotationValueMustBeClassLiteral);
567c159ce16f 8182747: javac crashes on bad annotation value
vromero
parents: 45504
diff changeset
   643
            return new Attribute.Error(syms.errType);
567c159ce16f 8182747: javac crashes on bad annotation value
vromero
parents: 45504
diff changeset
   644
        }
567c159ce16f 8182747: javac crashes on bad annotation value
vromero
parents: 45504
diff changeset
   645
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   646
        return new Attribute.Class(types,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   647
                (((JCFieldAccess) tree).selected).type);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   648
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   649
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   650
    private Attribute getAnnotationPrimitiveValue(Type expectedElementType, JCExpression tree, Env<AttrContext> env) {
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   651
        Type result = attr.attribTree(tree, env, annotationValueInfo(expectedElementType));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   652
        if (result.isErroneous())
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   653
            return new Attribute.Error(result.getOriginalType());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   654
        if (result.constValue() == null) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   655
            log.error(tree.pos(), Errors.AttributeValueMustBeConstant);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   656
            return new Attribute.Error(expectedElementType);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   657
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   658
        result = cfolder.coerce(result, expectedElementType);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   659
        return new Attribute.Constant(expectedElementType, result.constValue());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   660
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   661
47268
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   662
    private Attr.ResultInfo annotationValueInfo(Type pt) {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   663
        return attr.unknownExprInfo.dup(pt, new AnnotationValueContext(attr.unknownExprInfo.checkContext));
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   664
    }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   665
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   666
    class AnnotationValueContext extends Check.NestedCheckContext {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   667
        AnnotationValueContext(CheckContext enclosingContext) {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   668
            super(enclosingContext);
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   669
        }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   670
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   671
        @Override
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   672
        public boolean compatible(Type found, Type req, Warner warn) {
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   673
            //handle non-final implicitly-typed vars (will be rejected later on)
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   674
            return found.hasTag(TypeTag.NONE) || super.compatible(found, req, warn);
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   675
        }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   676
    }
48ec75306997 8177466: Add compiler support for local variable type-inference
mcimadamore
parents: 47216
diff changeset
   677
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   678
    private Attribute getAnnotationArrayValue(Type expectedElementType, JCExpression tree, Env<AttrContext> env) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   679
        // Special case, implicit array
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   680
        if (!tree.hasTag(NEWARRAY)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   681
            tree = make.at(tree.pos).
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42407
diff changeset
   682
                    NewArray(null, List.nil(), List.of(tree));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   683
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   684
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   685
        JCNewArray na = (JCNewArray)tree;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   686
        if (na.elemtype != null) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   687
            log.error(na.elemtype.pos(), Errors.NewNotAllowedInAnnotation);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   688
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   689
        ListBuffer<Attribute> buf = new ListBuffer<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   690
        for (List<JCExpression> l = na.elems; l.nonEmpty(); l=l.tail) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   691
            buf.append(attributeAnnotationValue(types.elemtype(expectedElementType),
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   692
                    l.head,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   693
                    env));
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   694
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   695
        na.type = expectedElementType;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   696
        return new Attribute.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   697
                Array(expectedElementType, buf.toArray(new Attribute[buf.length()]));
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   698
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   699
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   700
    /* *********************************
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   701
     * Support for repeating annotations
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   702
     ***********************************/
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   703
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   704
    /**
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   705
     * This context contains all the information needed to synthesize new
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   706
     * annotations trees for repeating annotations.
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   707
     */
23814
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   708
    private class AnnotationContext<T extends Attribute.Compound> {
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   709
        public final Env<AttrContext> env;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   710
        public final Map<Symbol.TypeSymbol, ListBuffer<T>> annotated;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   711
        public final Map<T, JCDiagnostic.DiagnosticPosition> pos;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   712
        public final boolean isTypeCompound;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   713
23814
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   714
        public AnnotationContext(Env<AttrContext> env,
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   715
                                 Map<Symbol.TypeSymbol, ListBuffer<T>> annotated,
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   716
                                 Map<T, JCDiagnostic.DiagnosticPosition> pos,
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   717
                                 boolean isTypeCompound) {
13840
a365c561f4de 7196774: javac cannot be built with JDK 6 after 7151010
jjg
parents: 13689
diff changeset
   718
            Assert.checkNonNull(env);
a365c561f4de 7196774: javac cannot be built with JDK 6 after 7151010
jjg
parents: 13689
diff changeset
   719
            Assert.checkNonNull(annotated);
a365c561f4de 7196774: javac cannot be built with JDK 6 after 7151010
jjg
parents: 13689
diff changeset
   720
            Assert.checkNonNull(pos);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   721
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   722
            this.env = env;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   723
            this.annotated = annotated;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   724
            this.pos = pos;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   725
            this.isTypeCompound = isTypeCompound;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   726
        }
23814
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   727
    }
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   728
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   729
    /* Process repeated annotations. This method returns the
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   730
     * synthesized container annotation or null IFF all repeating
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   731
     * annotation are invalid.  This method reports errors/warnings.
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   732
     */
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   733
    private <T extends Attribute.Compound> T processRepeatedAnnotations(List<T> annotations,
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   734
            AnnotationContext<T> ctx, Symbol on, boolean isTypeParam)
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   735
    {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   736
        T firstOccurrence = annotations.head;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   737
        List<Attribute> repeated = List.nil();
14804
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14359
diff changeset
   738
        Type origAnnoType = null;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   739
        Type arrayOfOrigAnnoType = null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   740
        Type targetContainerType = null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   741
        MethodSymbol containerValueSymbol = null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   742
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   743
        Assert.check(!annotations.isEmpty() && !annotations.tail.isEmpty()); // i.e. size() > 1
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   744
16342
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   745
        int count = 0;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   746
        for (List<T> al = annotations; !al.isEmpty(); al = al.tail) {
16342
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   747
            count++;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   748
16342
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   749
            // There must be more than a single anno in the annotation list
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   750
            Assert.check(count > 1 || !al.tail.isEmpty());
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   751
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   752
            T currentAnno = al.head;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   753
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   754
            origAnnoType = currentAnno.type;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   755
            if (arrayOfOrigAnnoType == null) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   756
                arrayOfOrigAnnoType = types.makeArrayType(origAnnoType);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   757
            }
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   758
16342
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   759
            // Only report errors if this isn't the first occurrence I.E. count > 1
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   760
            boolean reportError = count > 1;
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   761
            Type currentContainerType = getContainingType(currentAnno, ctx.pos.get(currentAnno), reportError);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   762
            if (currentContainerType == null) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   763
                continue;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   764
            }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   765
            // Assert that the target Container is == for all repeated
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   766
            // annos of the same annotation type, the types should
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   767
            // come from the same Symbol, i.e. be '=='
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   768
            Assert.check(targetContainerType == null || currentContainerType == targetContainerType);
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   769
            targetContainerType = currentContainerType;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   770
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   771
            containerValueSymbol = validateContainer(targetContainerType, origAnnoType, ctx.pos.get(currentAnno));
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   772
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   773
            if (containerValueSymbol == null) { // Check of CA type failed
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   774
                // errors are already reported
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   775
                continue;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   776
            }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   777
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   778
            repeated = repeated.prepend(currentAnno);
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   779
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   780
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   781
        if (!repeated.isEmpty() && targetContainerType == null) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   782
            log.error(ctx.pos.get(annotations.head), Errors.DuplicateAnnotationInvalidRepeated(origAnnoType));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   783
            return null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   784
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   785
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   786
        if (!repeated.isEmpty()) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   787
            repeated = repeated.reverse();
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   788
            DiagnosticPosition pos = ctx.pos.get(firstOccurrence);
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   789
            TreeMaker m = make.at(pos);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   790
            Pair<MethodSymbol, Attribute> p =
22165
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
   791
                    new Pair<MethodSymbol, Attribute>(containerValueSymbol,
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   792
                            new Attribute.Array(arrayOfOrigAnnoType, repeated));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   793
            if (ctx.isTypeCompound) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   794
                /* TODO: the following code would be cleaner:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   795
                Attribute.TypeCompound at = new Attribute.TypeCompound(targetContainerType, List.of(p),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   796
                        ((Attribute.TypeCompound)annotations.head).position);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   797
                JCTypeAnnotation annoTree = m.TypeAnnotation(at);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   798
                at = attributeTypeAnnotation(annoTree, targetContainerType, ctx.env);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   799
                */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   800
                // However, we directly construct the TypeCompound to keep the
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   801
                // direct relation to the contained TypeCompounds.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   802
                Attribute.TypeCompound at = new Attribute.TypeCompound(targetContainerType, List.of(p),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   803
                        ((Attribute.TypeCompound)annotations.head).position);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   804
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   805
                JCAnnotation annoTree = m.TypeAnnotation(at);
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   806
                if (!chk.validateAnnotationDeferErrors(annoTree))
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   807
                    log.error(annoTree.pos(), Errors.DuplicateAnnotationInvalidRepeated(origAnnoType));
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   808
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   809
                if (!chk.isTypeAnnotation(annoTree, isTypeParam)) {
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   810
                    log.error(pos, isTypeParam ? Errors.InvalidRepeatableAnnotationNotApplicable(targetContainerType, on)
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   811
                                               : Errors.InvalidRepeatableAnnotationNotApplicableInContext(targetContainerType));
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   812
                }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   813
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   814
                at.setSynthesized(true);
14804
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14359
diff changeset
   815
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   816
                @SuppressWarnings("unchecked")
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   817
                T x = (T) at;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   818
                return x;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   819
            } else {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   820
                Attribute.Compound c = new Attribute.Compound(targetContainerType, List.of(p));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   821
                JCAnnotation annoTree = m.Annotation(c);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   822
29960
d20c04ed8ffe 8043984: Confusing (incorrect) error message on repeatable annotations
alundblad
parents: 29842
diff changeset
   823
                if (!chk.annotationApplicable(annoTree, on)) {
d20c04ed8ffe 8043984: Confusing (incorrect) error message on repeatable annotations
alundblad
parents: 29842
diff changeset
   824
                    log.error(annoTree.pos(),
d20c04ed8ffe 8043984: Confusing (incorrect) error message on repeatable annotations
alundblad
parents: 29842
diff changeset
   825
                              Errors.InvalidRepeatableAnnotationNotApplicable(targetContainerType, on));
d20c04ed8ffe 8043984: Confusing (incorrect) error message on repeatable annotations
alundblad
parents: 29842
diff changeset
   826
                }
14804
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14359
diff changeset
   827
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   828
                if (!chk.validateAnnotationDeferErrors(annoTree))
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   829
                    log.error(annoTree.pos(), Errors.DuplicateAnnotationInvalidRepeated(origAnnoType));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   830
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   831
                c = attributeAnnotation(annoTree, targetContainerType, ctx.env);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   832
                c.setSynthesized(true);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   833
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   834
                @SuppressWarnings("unchecked")
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   835
                T x = (T) c;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   836
                return x;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15356
diff changeset
   837
            }
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   838
        } else {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   839
            return null; // errors should have been reported elsewhere
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   840
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   841
    }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   842
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   843
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   844
     * Fetches the actual Type that should be the containing annotation.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   845
     */
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   846
    private Type getContainingType(Attribute.Compound currentAnno,
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   847
                                   DiagnosticPosition pos,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   848
                                   boolean reportError)
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   849
    {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   850
        Type origAnnoType = currentAnno.type;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   851
        TypeSymbol origAnnoDecl = origAnnoType.tsym;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   852
15356
cf312dc54c60 8006119: update javac to follow latest spec for repeatable annotations
jjg
parents: 14961
diff changeset
   853
        // Fetch the Repeatable annotation from the current
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   854
        // annotation's declaration, or null if it has none
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   855
        Attribute.Compound ca = origAnnoDecl.getAnnotationTypeMetadata().getRepeatable();
15356
cf312dc54c60 8006119: update javac to follow latest spec for repeatable annotations
jjg
parents: 14961
diff changeset
   856
        if (ca == null) { // has no Repeatable annotation
16342
28d6ae9ed67c 7196531: Duplicate error messages on repeating annotations
jfranck
parents: 15385
diff changeset
   857
            if (reportError)
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   858
                log.error(pos, Errors.DuplicateAnnotationMissingContainer(origAnnoType));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   859
            return null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   860
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   861
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   862
        return filterSame(extractContainingType(ca, pos, origAnnoDecl),
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   863
                origAnnoType);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   864
    }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   865
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   866
    // returns null if t is same as 's', returns 't' otherwise
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   867
    private Type filterSame(Type t, Type s) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   868
        if (t == null || s == null) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   869
            return t;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   870
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   871
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   872
        return types.isSameType(t, s) ? null : t;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   873
    }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   874
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   875
    /** Extract the actual Type to be used for a containing annotation. */
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   876
    private Type extractContainingType(Attribute.Compound ca,
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   877
                                       DiagnosticPosition pos,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   878
                                       TypeSymbol annoDecl)
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   879
    {
15356
cf312dc54c60 8006119: update javac to follow latest spec for repeatable annotations
jjg
parents: 14961
diff changeset
   880
        // The next three checks check that the Repeatable annotation
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   881
        // on the declaration of the annotation type that is repeating is
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   882
        // valid.
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   883
15356
cf312dc54c60 8006119: update javac to follow latest spec for repeatable annotations
jjg
parents: 14961
diff changeset
   884
        // Repeatable must have at least one element
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   885
        if (ca.values.isEmpty()) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   886
            log.error(pos, Errors.InvalidRepeatableAnnotation(annoDecl));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   887
            return null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   888
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   889
        Pair<MethodSymbol,Attribute> p = ca.values.head;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   890
        Name name = p.fst.name;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   891
        if (name != names.value) { // should contain only one element, named "value"
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   892
            log.error(pos, Errors.InvalidRepeatableAnnotation(annoDecl));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   893
            return null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   894
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   895
        if (!(p.snd instanceof Attribute.Class)) { // check that the value of "value" is an Attribute.Class
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   896
            log.error(pos, Errors.InvalidRepeatableAnnotation(annoDecl));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   897
            return null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   898
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   899
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   900
        return ((Attribute.Class)p.snd).getValue();
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   901
    }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   902
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   903
    /* Validate that the suggested targetContainerType Type is a valid
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   904
     * container type for repeated instances of originalAnnoType
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   905
     * annotations. Return null and report errors if this is not the
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   906
     * case, return the MethodSymbol of the value element in
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   907
     * targetContainerType if it is suitable (this is needed to
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   908
     * synthesize the container). */
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   909
    private MethodSymbol validateContainer(Type targetContainerType,
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   910
                                           Type originalAnnoType,
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   911
                                           DiagnosticPosition pos) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   912
        MethodSymbol containerValueSymbol = null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   913
        boolean fatalError = false;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   914
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   915
        // Validate that there is a (and only 1) value method
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   916
        Scope scope = targetContainerType.tsym.members();
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   917
        int nr_value_elems = 0;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   918
        boolean error = false;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
   919
        for(Symbol elm : scope.getSymbolsByName(names.value)) {
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   920
            nr_value_elems++;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   921
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   922
            if (nr_value_elems == 1 &&
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   923
                    elm.kind == MTH) {
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   924
                containerValueSymbol = (MethodSymbol)elm;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   925
            } else {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   926
                error = true;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   927
            }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   928
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   929
        if (error) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   930
            log.error(pos,
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   931
                      Errors.InvalidRepeatableAnnotationMultipleValues(targetContainerType,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   932
                                                                       nr_value_elems));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   933
            return null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   934
        } else if (nr_value_elems == 0) {
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   935
            log.error(pos,
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   936
                      Errors.InvalidRepeatableAnnotationNoValue(targetContainerType));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   937
            return null;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   938
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   939
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   940
        // validate that the 'value' element is a method
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   941
        // probably "impossible" to fail this
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 27121
diff changeset
   942
        if (containerValueSymbol.kind != MTH) {
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   943
            log.error(pos,
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   944
                    Errors.InvalidRepeatableAnnotationInvalidValue(targetContainerType));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   945
            fatalError = true;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   946
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   947
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   948
        // validate that the 'value' element has the correct return type
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   949
        // i.e. array of original anno
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   950
        Type valueRetType = containerValueSymbol.type.getReturnType();
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   951
        Type expectedType = types.makeArrayType(originalAnnoType);
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   952
        if (!(types.isArray(valueRetType) &&
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   953
                types.isSameType(expectedType, valueRetType))) {
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   954
            log.error(pos,
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   955
                      Errors.InvalidRepeatableAnnotationValueReturn(targetContainerType,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   956
                                                                    valueRetType,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   957
                                                                    expectedType));
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   958
            fatalError = true;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   959
        }
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   960
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   961
        return fatalError ? null : containerValueSymbol;
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
   962
    }
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
   963
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   964
    private <T extends Attribute.Compound> T makeContainerAnnotation(List<T> toBeReplaced,
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   965
            AnnotationContext<T> ctx, Symbol sym, boolean isTypeParam)
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   966
    {
23814
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   967
        // Process repeated annotations
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   968
        T validRepeated =
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   969
                processRepeatedAnnotations(toBeReplaced, ctx, sym, isTypeParam);
23814
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   970
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   971
        if (validRepeated != null) {
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   972
            // Check that the container isn't manually
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   973
            // present along with repeated instances of
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   974
            // its contained annotation.
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   975
            ListBuffer<T> manualContainer = ctx.annotated.get(validRepeated.type.tsym);
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   976
            if (manualContainer != null) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   977
                log.error(ctx.pos.get(manualContainer.first()),
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 45500
diff changeset
   978
                          Errors.InvalidRepeatableAnnotationRepeatedAndContainerPresent(manualContainer.first().type.tsym));
23814
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   979
            }
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   980
        }
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   981
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   982
        // A null return will delete the Placeholder
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   983
        return validRepeated;
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   984
    }
06ab27895804 8038263: Refactor annotation handling after actualEnterAnnotations
emc
parents: 23397
diff changeset
   985
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   986
    /********************
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   987
     * Type annotations *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   988
     ********************/
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
   989
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   990
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   991
     * Attribute the list of annotations and enter them onto s.
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
   992
     */
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   993
    public void enterTypeAnnotations(List<JCAnnotation> annotations, Env<AttrContext> env,
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
   994
            Symbol s, DiagnosticPosition deferPos, boolean isTypeParam)
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   995
    {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
   996
        Assert.checkNonNull(s, "Symbol argument to actualEnterTypeAnnotations is nul/");
23129
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
   997
        JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
   998
        DiagnosticPosition prevLintPos = null;
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
   999
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1000
        if (deferPos != null) {
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1001
            prevLintPos = deferredLintHandler.setPos(deferPos);
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1002
        }
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1003
        try {
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
  1004
            annotateNow(s, annotations, env, true, isTypeParam);
23129
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1005
        } finally {
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1006
            if (prevLintPos != null)
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1007
                deferredLintHandler.setPos(prevLintPos);
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1008
            log.useSource(prev);
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1009
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1010
    }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1011
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1012
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1013
     * Enqueue tree for scanning of type annotations, attaching to the Symbol sym.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1014
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1015
    public void queueScanTreeAndTypeAnnotate(JCTree tree, Env<AttrContext> env, Symbol sym,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1016
            DiagnosticPosition deferPos)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1017
    {
23134
010b1b0d25fb 8036142: Remove redundant call to annotateTypeLater with null Symbol
emc
parents: 23129
diff changeset
  1018
        Assert.checkNonNull(sym);
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1019
        normal(() -> tree.accept(new TypeAnnotate(env, sym, deferPos)));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1020
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1021
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1022
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1023
     * Apply the annotations to the particular type.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1024
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1025
    public void annotateTypeSecondStage(JCTree tree, List<JCAnnotation> annotations, Type storeAt) {
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1026
        typeAnnotation(() -> {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1027
            List<Attribute.TypeCompound> compounds = fromAnnotations(annotations);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1028
            Assert.check(annotations.size() == compounds.size());
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1029
            storeAt.getMetadataOfKind(Kind.ANNOTATIONS).combine(new TypeMetadata.Annotations(compounds));
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1030
        });
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1031
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1032
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1033
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1034
     * Apply the annotations to the particular type.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1035
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1036
    public void annotateTypeParameterSecondStage(JCTree tree, List<JCAnnotation> annotations) {
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1037
        typeAnnotation(() -> {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1038
            List<Attribute.TypeCompound> compounds = fromAnnotations(annotations);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33370
diff changeset
  1039
            Assert.check(annotations.size() == compounds.size());
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1040
        });
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1041
    }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1042
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1043
    /**
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1044
     * We need to use a TreeScanner, because it is not enough to visit the top-level
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1045
     * annotations. We also need to visit type arguments, etc.
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1046
     */
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1047
    private class TypeAnnotate extends TreeScanner {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1048
        private final Env<AttrContext> env;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1049
        private final Symbol sym;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1050
        private DiagnosticPosition deferPos;
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1051
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1052
        public TypeAnnotate(Env<AttrContext> env, Symbol sym, DiagnosticPosition deferPos) {
23129
6d3b2e246dac 8035766: Execute TypeAnnotate visitor at queue flush time
emc
parents: 23126
diff changeset
  1053
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1054
            this.env = env;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1055
            this.sym = sym;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1056
            this.deferPos = deferPos;
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1057
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1058
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1059
        @Override
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1060
        public void visitAnnotatedType(JCAnnotatedType tree) {
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
  1061
            enterTypeAnnotations(tree.annotations, env, sym, deferPos, false);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1062
            scan(tree.underlyingType);
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1063
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1064
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1065
        @Override
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1066
        public void visitTypeParameter(JCTypeParameter tree) {
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
  1067
            enterTypeAnnotations(tree.annotations, env, sym, deferPos, true);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1068
            scan(tree.bounds);
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1069
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1070
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1071
        @Override
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1072
        public void visitNewArray(JCNewArray tree) {
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
  1073
            enterTypeAnnotations(tree.annotations, env, sym, deferPos, false);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1074
            for (List<JCAnnotation> dimAnnos : tree.dimAnnotations)
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 30066
diff changeset
  1075
                enterTypeAnnotations(dimAnnos, env, sym, deferPos, false);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1076
            scan(tree.elemtype);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1077
            scan(tree.elems);
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1078
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1079
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1080
        @Override
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1081
        public void visitMethodDef(JCMethodDecl tree) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1082
            scan(tree.mods);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1083
            scan(tree.restype);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1084
            scan(tree.typarams);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1085
            scan(tree.recvparam);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1086
            scan(tree.params);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1087
            scan(tree.thrown);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1088
            scan(tree.defaultValue);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1089
            // Do not annotate the body, just the signature.
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1090
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1091
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1092
        @Override
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1093
        public void visitVarDef(JCVariableDecl tree) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1094
            DiagnosticPosition prevPos = deferPos;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1095
            deferPos = tree.pos();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1096
            try {
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 27121
diff changeset
  1097
                if (sym != null && sym.kind == VAR) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1098
                    // Don't visit a parameter once when the sym is the method
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1099
                    // and once when the sym is the parameter.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1100
                    scan(tree.mods);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1101
                    scan(tree.vartype);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1102
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1103
                scan(tree.init);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1104
            } finally {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1105
                deferPos = prevPos;
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1106
            }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1107
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1108
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1109
        @Override
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1110
        public void visitClassDef(JCClassDecl tree) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1111
            // We can only hit a classdef if it is declared within
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1112
            // a method. Ignore it - the class will be visited
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1113
            // separately later.
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1114
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1115
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1116
        @Override
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1117
        public void visitNewClass(JCNewClass tree) {
33370
f563e436a81f 8057685: javac should not crash compiling type annotations
sadayapalam
parents: 30069
diff changeset
  1118
            scan(tree.encl);
f563e436a81f 8057685: javac should not crash compiling type annotations
sadayapalam
parents: 30069
diff changeset
  1119
            scan(tree.typeargs);
52278
e11a53698d57 8198945: Invalid RuntimeVisibleTypeAnnotations for annotation on anonymous class type parameter
cushon
parents: 48054
diff changeset
  1120
            if (tree.def == null) {
e11a53698d57 8198945: Invalid RuntimeVisibleTypeAnnotations for annotation on anonymous class type parameter
cushon
parents: 48054
diff changeset
  1121
                scan(tree.clazz);
e11a53698d57 8198945: Invalid RuntimeVisibleTypeAnnotations for annotation on anonymous class type parameter
cushon
parents: 48054
diff changeset
  1122
            }
33370
f563e436a81f 8057685: javac should not crash compiling type annotations
sadayapalam
parents: 30069
diff changeset
  1123
            scan(tree.args);
f563e436a81f 8057685: javac should not crash compiling type annotations
sadayapalam
parents: 30069
diff changeset
  1124
            // the anonymous class instantiation if any will be visited separately.
23126
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1125
        }
1994a0d3b8de 8035758: Move annotation codepaths from MemberEnter.java to Annotate.java
emc
parents: 22702
diff changeset
  1126
    }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1127
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1128
    /*********************
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1129
     * Completer support *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1130
     *********************/
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1131
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1132
    private AnnotationTypeCompleter theSourceCompleter = new AnnotationTypeCompleter() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1133
        @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1134
        public void complete(ClassSymbol sym) throws CompletionFailure {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1135
            Env<AttrContext> context = typeEnvs.get(sym);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1136
            Annotate.this.attributeAnnotationType(context);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1137
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1138
    };
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1139
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1140
    /* Last stage completer to enter just enough annotations to have a prototype annotation type.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1141
     * This currently means entering @Target and @Repetable.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1142
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1143
    public AnnotationTypeCompleter annotationTypeSourceCompleter() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1144
        return theSourceCompleter;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1145
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1146
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1147
    private void attributeAnnotationType(Env<AttrContext> env) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1148
        Assert.check(((JCClassDecl)env.tree).sym.isAnnotationType(),
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1149
                "Trying to annotation type complete a non-annotation type");
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1150
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1151
        JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1152
        try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1153
            JCClassDecl tree = (JCClassDecl)env.tree;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1154
            AnnotationTypeVisitor v = new AnnotationTypeVisitor(attr, chk, syms, typeEnvs);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1155
            v.scanAnnotationType(tree);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1156
            tree.sym.getAnnotationTypeMetadata().setRepeatable(v.repeatable);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1157
            tree.sym.getAnnotationTypeMetadata().setTarget(v.target);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1158
        } finally {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1159
            log.useSource(prev);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1160
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1161
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1162
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1163
    public Attribute unfinishedDefaultValue() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1164
        return theUnfinishedDefaultValue;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1165
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1166
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1167
    public static interface AnnotationTypeCompleter {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1168
        void complete(ClassSymbol sym) throws CompletionFailure;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1169
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1170
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1171
    /** Visitor to determine a prototype annotation type for a class declaring an annotation type.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1172
     *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1173
     *  <p><b>This is NOT part of any supported API.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1174
     *  If you write code that depends on this, you do so at your own risk.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1175
     *  This code and its internal interfaces are subject to change or
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1176
     *  deletion without notice.</b>
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1177
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1178
    public class AnnotationTypeVisitor extends TreeScanner {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1179
        private Env<AttrContext> env;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1180
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1181
        private final Attr attr;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1182
        private final Check check;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1183
        private final Symtab tab;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1184
        private final TypeEnvs typeEnvs;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1185
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1186
        private Compound target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1187
        private Compound repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1188
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1189
        public AnnotationTypeVisitor(Attr attr, Check check, Symtab tab, TypeEnvs typeEnvs) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1190
            this.attr = attr;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1191
            this.check = check;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1192
            this.tab = tab;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1193
            this.typeEnvs = typeEnvs;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1194
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1195
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1196
        public Compound getRepeatable() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1197
            return repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1198
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1199
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1200
        public Compound getTarget() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1201
            return target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1202
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1203
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1204
        public void scanAnnotationType(JCClassDecl decl) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1205
            visitClassDef(decl);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1206
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1207
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1208
        @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1209
        public void visitClassDef(JCClassDecl tree) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1210
            Env<AttrContext> prevEnv = env;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1211
            env = typeEnvs.get(tree.sym);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1212
            try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1213
                scan(tree.mods); // look for repeatable and target
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1214
                // don't descend into body
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1215
            } finally {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1216
                env = prevEnv;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1217
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1218
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1219
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1220
        @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1221
        public void visitAnnotation(JCAnnotation tree) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1222
            Type t = tree.annotationType.type;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1223
            if (t == null) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1224
                t = attr.attribType(tree.annotationType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1225
                tree.annotationType.type = t = check.checkType(tree.annotationType.pos(), t, tab.annotationType);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1226
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1227
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1228
            if (t == tab.annotationTargetType) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1229
                target = Annotate.this.attributeAnnotation(tree, tab.annotationTargetType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1230
            } else if (t == tab.repeatableType) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1231
                repeatable = Annotate.this.attributeAnnotation(tree, tab.repeatableType, env);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1232
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1233
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1234
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1235
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1236
    /** Represents the semantics of an Annotation Type.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1237
     *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1238
     *  <p><b>This is NOT part of any supported API.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1239
     *  If you write code that depends on this, you do so at your own risk.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1240
     *  This code and its internal interfaces are subject to change or
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1241
     *  deletion without notice.</b>
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1242
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1243
    public static class AnnotationTypeMetadata {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1244
        final ClassSymbol metaDataFor;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1245
        private Compound target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1246
        private Compound repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1247
        private AnnotationTypeCompleter annotationTypeCompleter;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1248
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1249
        public AnnotationTypeMetadata(ClassSymbol metaDataFor, AnnotationTypeCompleter annotationTypeCompleter) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1250
            this.metaDataFor = metaDataFor;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1251
            this.annotationTypeCompleter = annotationTypeCompleter;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1252
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1253
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1254
        private void init() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1255
            // Make sure metaDataFor is member entered
30066
d74c06a92bd8 8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents: 29960
diff changeset
  1256
            while (!metaDataFor.isCompleted())
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1257
                metaDataFor.complete();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1258
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1259
            if (annotationTypeCompleter != null) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1260
                AnnotationTypeCompleter c = annotationTypeCompleter;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1261
                annotationTypeCompleter = null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1262
                c.complete(metaDataFor);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1263
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1264
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1265
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1266
        public void complete() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1267
            init();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1268
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1269
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1270
        public Compound getRepeatable() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1271
            init();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1272
            return repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1273
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1274
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1275
        public void setRepeatable(Compound repeatable) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1276
            Assert.checkNull(this.repeatable);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1277
            this.repeatable = repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1278
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1279
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1280
        public Compound getTarget() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1281
            init();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1282
            return target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1283
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1284
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1285
        public void setTarget(Compound target) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1286
            Assert.checkNull(this.target);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1287
                this.target = target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1288
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1289
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1290
        public Set<MethodSymbol> getAnnotationElements() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1291
            init();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1292
            Set<MethodSymbol> members = new LinkedHashSet<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1293
            WriteableScope s = metaDataFor.members();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1294
            Iterable<Symbol> ss = s.getSymbols(NON_RECURSIVE);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1295
            for (Symbol sym : ss)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1296
                if (sym.kind == MTH &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1297
                        sym.name != sym.name.table.names.clinit &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1298
                        (sym.flags() & SYNTHETIC) == 0)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1299
                    members.add((MethodSymbol)sym);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1300
            return members;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1301
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1302
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1303
        public Set<MethodSymbol> getAnnotationElementsWithDefault() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1304
            init();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1305
            Set<MethodSymbol> members = getAnnotationElements();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1306
            Set<MethodSymbol> res = new LinkedHashSet<>();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1307
            for (MethodSymbol m : members)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1308
                if (m.defaultValue != null)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1309
                    res.add(m);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1310
            return res;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1311
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1312
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1313
        @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1314
        public String toString() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1315
            return "Annotation type for: " + metaDataFor;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1316
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1317
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1318
        public boolean isMetadataForAnnotationType() { return true; }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1319
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1320
        public static AnnotationTypeMetadata notAnAnnotationType() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1321
            return NOT_AN_ANNOTATION_TYPE;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1322
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1323
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1324
        private static final AnnotationTypeMetadata NOT_AN_ANNOTATION_TYPE =
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1325
                new AnnotationTypeMetadata(null, null) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1326
                    @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1327
                    public void complete() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1328
                    } // do nothing
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1329
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1330
                    @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1331
                    public String toString() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1332
                        return "Not an annotation type";
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1333
                    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1334
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1335
                    @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1336
                    public Set<MethodSymbol> getAnnotationElements() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1337
                        return new LinkedHashSet<>(0);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1338
                    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1339
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1340
                    @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1341
                    public Set<MethodSymbol> getAnnotationElementsWithDefault() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1342
                        return new LinkedHashSet<>(0);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1343
                    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1344
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1345
                    @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1346
                    public boolean isMetadataForAnnotationType() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1347
                        return false;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1348
                    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1349
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1350
                    @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1351
                    public Compound getTarget() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1352
                        return null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1353
                    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1354
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1355
                    @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1356
                    public Compound getRepeatable() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1357
                        return null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1358
                    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1359
                };
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1360
    }
43269
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
  1361
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
  1362
    public void newRound() {
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
  1363
        blockCount = 1;
12f989542165 8171098: NPE when --add-modules java.corba is used
jlahoda
parents: 43143
diff changeset
  1364
    }
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 10950
diff changeset
  1365
}