langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
author alundblad
Mon, 21 Dec 2015 17:47:21 +0100
changeset 34762 d68b7daca533
parent 33712 fd1ce6d7ac63
child 35358 edabc0b735a5
permissions -rw-r--r--
8057548: Annotate.Worker should be replaced with lambdas Summary: Anonymous Runnables (which used to be Annotate.Worker) replaced by lambdas. Reviewed-by: mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     1
/*
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
     2
 * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     4
 *
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    10
 *
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    15
 * accompanied this code).
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    16
 *
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    20
 *
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    23
 * questions.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    24
 */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    25
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    26
package com.sun.tools.javac.code;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    27
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    28
import javax.lang.model.element.Element;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    29
import javax.lang.model.element.ElementKind;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    30
import javax.lang.model.type.TypeKind;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    31
import javax.tools.JavaFileObject;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    32
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    33
import com.sun.tools.javac.code.Attribute.Array;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    34
import com.sun.tools.javac.code.Attribute.TypeCompound;
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
    35
import com.sun.tools.javac.code.Symbol.ClassSymbol;
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 29842
diff changeset
    36
import com.sun.tools.javac.code.Symbol.TypeSymbol;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    37
import com.sun.tools.javac.code.Type.ArrayType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    38
import com.sun.tools.javac.code.Type.CapturedType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    39
import com.sun.tools.javac.code.Type.ClassType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    40
import com.sun.tools.javac.code.Type.ErrorType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    41
import com.sun.tools.javac.code.Type.ForAll;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    42
import com.sun.tools.javac.code.Type.MethodType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    43
import com.sun.tools.javac.code.Type.PackageType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    44
import com.sun.tools.javac.code.Type.TypeVar;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    45
import com.sun.tools.javac.code.Type.UndetVar;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    46
import com.sun.tools.javac.code.Type.Visitor;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    47
import com.sun.tools.javac.code.Type.WildcardType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    48
import com.sun.tools.javac.code.TypeAnnotationPosition.TypePathEntry;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    49
import com.sun.tools.javac.code.TypeAnnotationPosition.TypePathEntryKind;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    50
import com.sun.tools.javac.code.Symbol.VarSymbol;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    51
import com.sun.tools.javac.code.Symbol.MethodSymbol;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
    52
import com.sun.tools.javac.code.TypeMetadata.Entry.Kind;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    53
import com.sun.tools.javac.comp.Annotate;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    54
import com.sun.tools.javac.comp.Attr;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    55
import com.sun.tools.javac.comp.AttrContext;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    56
import com.sun.tools.javac.comp.Env;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    57
import com.sun.tools.javac.tree.JCTree;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    58
import com.sun.tools.javac.tree.TreeInfo;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    59
import com.sun.tools.javac.tree.JCTree.JCBlock;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    60
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    61
import com.sun.tools.javac.tree.JCTree.JCExpression;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    62
import com.sun.tools.javac.tree.JCTree.JCLambda;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    63
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    64
import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    65
import com.sun.tools.javac.tree.JCTree.JCNewClass;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    66
import com.sun.tools.javac.tree.JCTree.JCTypeApply;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    67
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    68
import com.sun.tools.javac.tree.TreeScanner;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    69
import com.sun.tools.javac.tree.JCTree.*;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    70
import com.sun.tools.javac.util.Assert;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    71
import com.sun.tools.javac.util.Context;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    72
import com.sun.tools.javac.util.List;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    73
import com.sun.tools.javac.util.ListBuffer;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    74
import com.sun.tools.javac.util.Log;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    75
import com.sun.tools.javac.util.Names;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    76
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
    77
import static com.sun.tools.javac.code.Kinds.Kind.*;
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
    78
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    79
/**
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    80
 * Contains operations specific to processing type annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    81
 * This class has two functions:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    82
 * separate declaration from type annotations and insert the type
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    83
 * annotations to their types;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    84
 * and determine the TypeAnnotationPositions for all type annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    85
 */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    86
public class TypeAnnotations {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    87
    protected static final Context.Key<TypeAnnotations> typeAnnosKey = new Context.Key<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    88
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    89
    public static TypeAnnotations instance(Context context) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    90
        TypeAnnotations instance = context.get(typeAnnosKey);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    91
        if (instance == null)
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    92
            instance = new TypeAnnotations(context);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    93
        return instance;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    94
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    95
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    96
    final Log log;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    97
    final Names names;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    98
    final Symtab syms;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
    99
    final Annotate annotate;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   100
    final Attr attr;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   101
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   102
    protected TypeAnnotations(Context context) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   103
        context.put(typeAnnosKey, this);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   104
        names = Names.instance(context);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   105
        log = Log.instance(context);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   106
        syms = Symtab.instance(context);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   107
        annotate = Annotate.instance(context);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   108
        attr = Attr.instance(context);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   109
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   110
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   111
    /**
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   112
     * Separate type annotations from declaration annotations and
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   113
     * determine the correct positions for type annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   114
     * This version only visits types in signatures and should be
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   115
     * called from MemberEnter.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   116
     */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   117
    public void organizeTypeAnnotationsSignatures(final Env<AttrContext> env, final JCClassDecl tree) {
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   118
        annotate.afterTypes(() -> {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   119
            JavaFileObject oldSource = log.useSource(env.toplevel.sourcefile);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   120
            try {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   121
                new TypeAnnotationPositions(true).scan(tree);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   122
            } finally {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   123
                log.useSource(oldSource);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   124
            }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   125
        });
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   126
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   127
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   128
    public void validateTypeAnnotationsSignatures(final Env<AttrContext> env, final JCClassDecl tree) {
34762
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   129
        annotate.validate(() -> { //validate annotations
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   130
            JavaFileObject oldSource = log.useSource(env.toplevel.sourcefile);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   131
            try {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   132
                attr.validateTypeAnnotations(tree, true);
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   133
            } finally {
d68b7daca533 8057548: Annotate.Worker should be replaced with lambdas
alundblad
parents: 33712
diff changeset
   134
                log.useSource(oldSource);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   135
            }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   136
        });
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   137
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   138
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   139
    /**
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   140
     * This version only visits types in bodies, that is, field initializers,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   141
     * top-level blocks, and method bodies, and should be called from Attr.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   142
     */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   143
    public void organizeTypeAnnotationsBodies(JCClassDecl tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   144
        new TypeAnnotationPositions(false).scan(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   145
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   146
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   147
    public enum AnnotationType { DECLARATION, TYPE, NONE, BOTH }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   148
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 29842
diff changeset
   149
    public List<Attribute> annotationTargets(TypeSymbol tsym) {
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 29842
diff changeset
   150
        Attribute.Compound atTarget = tsym.getAnnotationTypeMetadata().getTarget();
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   151
        if (atTarget == null) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   152
            return null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   153
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   154
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   155
        Attribute atValue = atTarget.member(names.value);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   156
        if (!(atValue instanceof Attribute.Array)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   157
            return null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   158
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   159
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   160
        List<Attribute> targets = ((Array)atValue).getValue();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   161
        if (targets.stream().anyMatch(a -> !(a instanceof Attribute.Enum))) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   162
            return null;
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
        return targets;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   166
    }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   167
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   168
    /**
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   169
     * Determine whether an annotation is a declaration annotation,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   170
     * a type annotation, or both.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   171
     */
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   172
    public AnnotationType annotationTargetType(Attribute.Compound a, Symbol s) {
30069
5686d5e44a83 8044196: Incorrect applying of repeatable annotations with incompatible target to type parameter
alundblad
parents: 29842
diff changeset
   173
        List<Attribute> targets = annotationTargets(a.type.tsym);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   174
        return (targets == null) ?
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   175
                AnnotationType.DECLARATION :
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   176
                targets.stream()
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   177
                        .map(attr -> targetToAnnotationType(attr, s))
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   178
                        .reduce(AnnotationType.NONE, this::combineAnnotationType);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   179
    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   180
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   181
    private AnnotationType combineAnnotationType(AnnotationType at1, AnnotationType at2) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   182
        if (at1 == AnnotationType.NONE) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   183
            return at2;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   184
        } else if (at2 == AnnotationType.NONE) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   185
            return at1;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   186
        } else if (at1 != at2) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   187
            return AnnotationType.BOTH;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   188
        } else {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   189
            return at1;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   190
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   191
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   192
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   193
    private AnnotationType targetToAnnotationType(Attribute a, Symbol s) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   194
        Attribute.Enum e = (Attribute.Enum)a;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   195
        if (e.value.name == names.TYPE) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   196
            if (s.kind == TYP)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   197
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   198
        } else if (e.value.name == names.FIELD) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   199
            if (s.kind == VAR &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   200
                    s.owner.kind != MTH)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   201
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   202
        } else if (e.value.name == names.METHOD) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   203
            if (s.kind == MTH &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   204
                    !s.isConstructor())
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   205
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   206
        } else if (e.value.name == names.PARAMETER) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   207
            if (s.kind == VAR &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   208
                    s.owner.kind == MTH &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   209
                    (s.flags() & Flags.PARAMETER) != 0)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   210
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   211
        } else if (e.value.name == names.CONSTRUCTOR) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   212
            if (s.kind == MTH &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   213
                    s.isConstructor())
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   214
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   215
        } else if (e.value.name == names.LOCAL_VARIABLE) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   216
            if (s.kind == VAR &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   217
                    s.owner.kind == MTH &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   218
                    (s.flags() & Flags.PARAMETER) == 0)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   219
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   220
        } else if (e.value.name == names.ANNOTATION_TYPE) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   221
            if (s.kind == TYP &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   222
                    (s.flags() & Flags.ANNOTATION) != 0)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   223
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   224
        } else if (e.value.name == names.PACKAGE) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   225
            if (s.kind == PCK)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   226
                return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   227
        } else if (e.value.name == names.TYPE_USE) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   228
            if (s.kind == TYP ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   229
                    s.kind == VAR ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   230
                    (s.kind == MTH && !s.isConstructor() &&
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   231
                    !s.type.getReturnType().hasTag(TypeTag.VOID)) ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   232
                    (s.kind == MTH && s.isConstructor()))
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   233
                return AnnotationType.TYPE;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   234
        } else if (e.value.name == names.TYPE_PARAMETER) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   235
            /* Irrelevant in this case */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   236
            // TYPE_PARAMETER doesn't aid in distinguishing between
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   237
            // Type annotations and declaration annotations on an
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   238
            // Element
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   239
        } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   240
            Assert.error("annotationTargetType(): unrecognized Attribute name " + e.value.name +
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   241
                    " (" + e.value.name.getClass() + ")");
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   242
            return AnnotationType.DECLARATION;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   243
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   244
        return AnnotationType.NONE;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   245
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   246
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   247
    private class TypeAnnotationPositions extends TreeScanner {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   248
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   249
        private final boolean sigOnly;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   250
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   251
        TypeAnnotationPositions(boolean sigOnly) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   252
            this.sigOnly = sigOnly;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   253
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   254
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   255
        /*
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   256
         * When traversing the AST we keep the "frames" of visited
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   257
         * trees in order to determine the position of annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   258
         */
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   259
        private List<JCTree> frames = List.nil();
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   260
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   261
        protected void push(JCTree t) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   262
            frames = frames.prepend(t);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   263
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   264
        protected JCTree pop() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   265
            JCTree t = frames.head;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   266
            frames = frames.tail;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   267
            return t;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   268
            }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   269
        // could this be frames.elems.tail.head?
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   270
        private JCTree peek2() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   271
            return frames.tail.head;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   272
        }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   273
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   274
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   275
        public void scan(JCTree tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   276
            push(tree);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   277
            try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   278
                super.scan(tree);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   279
            } finally {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   280
                pop();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   281
            }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   282
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   283
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   284
        /**
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   285
         * Separates type annotations from declaration annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   286
         * This step is needed because in certain locations (where declaration
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   287
         * and type annotations can be mixed, e.g. the type of a field)
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   288
         * we never build an JCAnnotatedType. This step finds these
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   289
         * annotations and marks them as if they were part of the type.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   290
         */
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   291
        private void separateAnnotationsKinds(JCTree typetree, Type type,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   292
                                              Symbol sym, TypeAnnotationPosition pos)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   293
        {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   294
            List<Attribute.Compound> allAnnotations = sym.getRawAttributes();
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   295
            ListBuffer<Attribute.Compound> declAnnos = new ListBuffer<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   296
            ListBuffer<Attribute.TypeCompound> typeAnnos = new ListBuffer<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   297
            ListBuffer<Attribute.TypeCompound> onlyTypeAnnos = new ListBuffer<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   298
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   299
            for (Attribute.Compound a : allAnnotations) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   300
                switch (annotationTargetType(a, sym)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   301
                    case DECLARATION:
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   302
                        declAnnos.append(a);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   303
                        break;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   304
                    case BOTH: {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   305
                        declAnnos.append(a);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   306
                        Attribute.TypeCompound ta = toTypeCompound(a, pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   307
                        typeAnnos.append(ta);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   308
                        break;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   309
                    }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   310
                    case TYPE: {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   311
                        Attribute.TypeCompound ta = toTypeCompound(a, pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   312
                        typeAnnos.append(ta);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   313
                        // Also keep track which annotations are only type annotations
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   314
                        onlyTypeAnnos.append(ta);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   315
                        break;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   316
                    }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   317
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   318
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   319
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   320
            // If we have no type annotations we are done for this Symbol
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   321
            if (typeAnnos.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   322
                return;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   323
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   324
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   325
            // Reset decl annotations to the set {all - type only}
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   326
            sym.resetAnnotations();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   327
            sym.setDeclarationAttributes(declAnnos.toList());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   328
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   329
            List<Attribute.TypeCompound> typeAnnotations = typeAnnos.toList();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   330
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   331
            if (type == null) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   332
                // When type is null, put the type annotations to the symbol.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   333
                // This is used for constructor return annotations, for which
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   334
                // we use the type of the enclosing class.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   335
                type = sym.getEnclosingElement().asType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   336
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   337
                // Declaration annotations are always allowed on constructor returns.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   338
                // Therefore, use typeAnnotations instead of onlyTypeAnnos.
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   339
                typeWithAnnotations(typetree, type, typeAnnotations, typeAnnotations, pos);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   340
                // Note that we don't use the result, the call to
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   341
                // typeWithAnnotations side-effects the type annotation positions.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   342
                // This is important for constructors of nested classes.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   343
                sym.appendUniqueTypeAttributes(typeAnnotations);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   344
                return;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   345
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   346
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   347
            // type is non-null, add type annotations from declaration context to the type
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   348
            type = typeWithAnnotations(typetree, type, typeAnnotations, onlyTypeAnnos.toList(), pos);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   349
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   350
            if (sym.getKind() == ElementKind.METHOD) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   351
                sym.type.asMethodType().restype = type;
33370
f563e436a81f 8057685: javac should not crash compiling type annotations
sadayapalam
parents: 30069
diff changeset
   352
            } else if (sym.getKind() == ElementKind.PARAMETER && currentLambda == null) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   353
                sym.type = type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   354
                if (sym.getQualifiedName().equals(names._this)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   355
                    sym.owner.type.asMethodType().recvtype = type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   356
                    // note that the typeAnnotations will also be added to the owner below.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   357
                } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   358
                    MethodType methType = sym.owner.type.asMethodType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   359
                    List<VarSymbol> params = ((MethodSymbol)sym.owner).params;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   360
                    List<Type> oldArgs = methType.argtypes;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   361
                    ListBuffer<Type> newArgs = new ListBuffer<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   362
                    while (params.nonEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   363
                        if (params.head == sym) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   364
                            newArgs.add(type);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   365
                        } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   366
                            newArgs.add(oldArgs.head);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   367
                        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   368
                        oldArgs = oldArgs.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   369
                        params = params.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   370
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   371
                    methType.argtypes = newArgs.toList();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   372
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   373
            } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   374
                sym.type = type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   375
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   376
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   377
            sym.appendUniqueTypeAttributes(typeAnnotations);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   378
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   379
            if (sym.getKind() == ElementKind.PARAMETER ||
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   380
                sym.getKind() == ElementKind.LOCAL_VARIABLE ||
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   381
                sym.getKind() == ElementKind.RESOURCE_VARIABLE ||
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   382
                sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   383
                // Make sure all type annotations from the symbol are also
33712
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   384
                // on the owner. If the owner is an initializer block, propagate
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   385
                // to the type.
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   386
                final long ownerFlags = sym.owner.flags();
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   387
                if ((ownerFlags & Flags.BLOCK) != 0) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   388
                    // Store init and clinit type annotations with the ClassSymbol
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   389
                    // to allow output in Gen.normalizeDefs.
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   390
                    ClassSymbol cs = (ClassSymbol) sym.owner.owner;
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   391
                    if ((ownerFlags & Flags.STATIC) != 0) {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   392
                        cs.appendClassInitTypeAttributes(typeAnnotations);
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   393
                    } else {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   394
                        cs.appendInitTypeAttributes(typeAnnotations);
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   395
                    }
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   396
                } else {
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   397
                    sym.owner.appendUniqueTypeAttributes(sym.getRawTypeAttributes());
fd1ce6d7ac63 8136419: Type annotations in initializers and lambda bodies not written to class file
sadayapalam
parents: 33370
diff changeset
   398
                }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   399
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   400
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   401
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   402
        // This method has a similar purpose as
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   403
        // {@link com.sun.tools.javac.parser.JavacParser.insertAnnotationsToMostInner(JCExpression, List<JCTypeAnnotation>, boolean)}
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   404
        // We found a type annotation in a declaration annotation position,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   405
        // for example, on the return type.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   406
        // Such an annotation is _not_ part of an JCAnnotatedType tree and we therefore
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   407
        // need to set its position explicitly.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   408
        // The method returns a copy of type that contains these annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   409
        //
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   410
        // As a side effect the method sets the type annotation position of "annotations".
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   411
        // Note that it is assumed that all annotations share the same position.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   412
        private Type typeWithAnnotations(final JCTree typetree, final Type type,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   413
                final List<Attribute.TypeCompound> annotations,
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   414
                final List<Attribute.TypeCompound> onlyTypeAnnotations,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   415
                final TypeAnnotationPosition pos)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   416
        {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   417
            if (annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   418
                return type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   419
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   420
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   421
            if (type.hasTag(TypeTag.ARRAY))
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   422
                return rewriteArrayType((ArrayType)type, annotations, pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   423
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   424
            if (type.hasTag(TypeTag.TYPEVAR)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   425
                return type.annotatedType(onlyTypeAnnotations);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   426
            } else if (type.getKind() == TypeKind.UNION) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   427
                // There is a TypeKind, but no TypeTag.
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   428
                JCTypeUnion tutree = (JCTypeUnion)typetree;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   429
                JCExpression fst = tutree.alternatives.get(0);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   430
                Type res = typeWithAnnotations(fst, fst.type, annotations, onlyTypeAnnotations, pos);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   431
                fst.type = res;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   432
                // TODO: do we want to set res as first element in uct.alternatives?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   433
                // UnionClassType uct = (com.sun.tools.javac.code.Type.UnionClassType)type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   434
                // Return the un-annotated union-type.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   435
                return type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   436
            } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   437
                Type enclTy = type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   438
                Element enclEl = type.asElement();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   439
                JCTree enclTr = typetree;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   440
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   441
                while (enclEl != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   442
                        enclEl.getKind() != ElementKind.PACKAGE &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   443
                        enclTy != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   444
                        enclTy.getKind() != TypeKind.NONE &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   445
                        enclTy.getKind() != TypeKind.ERROR &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   446
                        (enclTr.getKind() == JCTree.Kind.MEMBER_SELECT ||
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   447
                                enclTr.getKind() == JCTree.Kind.PARAMETERIZED_TYPE ||
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   448
                                enclTr.getKind() == JCTree.Kind.ANNOTATED_TYPE)) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   449
                    // Iterate also over the type tree, not just the type: the type is already
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   450
                    // completely resolved and we cannot distinguish where the annotation
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   451
                    // belongs for a nested type.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   452
                    if (enclTr.getKind() == JCTree.Kind.MEMBER_SELECT) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   453
                        // only change encl in this case.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   454
                        enclTy = enclTy.getEnclosingType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   455
                        enclEl = enclEl.getEnclosingElement();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   456
                        enclTr = ((JCFieldAccess)enclTr).getExpression();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   457
                    } else if (enclTr.getKind() == JCTree.Kind.PARAMETERIZED_TYPE) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   458
                        enclTr = ((JCTypeApply)enclTr).getType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   459
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   460
                        // only other option because of while condition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   461
                        enclTr = ((JCAnnotatedType)enclTr).getUnderlyingType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   462
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   463
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   464
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   465
                /** We are trying to annotate some enclosing type,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   466
                 * but nothing more exists.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   467
                 */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   468
                if (enclTy != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   469
                        enclTy.hasTag(TypeTag.NONE)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   470
                    switch (onlyTypeAnnotations.size()) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   471
                        case 0:
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   472
                            // Don't issue an error if all type annotations are
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   473
                            // also declaration annotations.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   474
                            // If the annotations are also declaration annotations, they are
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   475
                            // illegal as type annotations but might be legal as declaration annotations.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   476
                            // The normal declaration annotation checks make sure that the use is valid.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   477
                            break;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   478
                        case 1:
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   479
                            log.error(typetree.pos(), "cant.type.annotate.scoping.1",
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   480
                                    onlyTypeAnnotations);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   481
                            break;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   482
                        default:
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   483
                            log.error(typetree.pos(), "cant.type.annotate.scoping",
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   484
                                    onlyTypeAnnotations);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   485
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   486
                    return type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   487
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   488
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   489
                // At this point we have visited the part of the nested
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   490
                // type that is written in the source code.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   491
                // Now count from here to the actual top-level class to determine
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   492
                // the correct nesting.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   493
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   494
                // The genericLocation for the annotation.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   495
                ListBuffer<TypePathEntry> depth = new ListBuffer<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   496
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   497
                Type topTy = enclTy;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   498
                while (enclEl != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   499
                        enclEl.getKind() != ElementKind.PACKAGE &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   500
                        topTy != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   501
                        topTy.getKind() != TypeKind.NONE &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   502
                        topTy.getKind() != TypeKind.ERROR) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   503
                    topTy = topTy.getEnclosingType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   504
                    enclEl = enclEl.getEnclosingElement();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   505
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   506
                    if (topTy != null && topTy.getKind() != TypeKind.NONE) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   507
                        // Only count enclosing types.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   508
                        depth = depth.append(TypePathEntry.INNER_TYPE);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   509
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   510
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   511
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   512
                if (depth.nonEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   513
                    // Only need to change the annotation positions
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   514
                    // if they are on an enclosed type.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   515
                    // All annotations share the same position; modify the first one.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   516
                    Attribute.TypeCompound a = annotations.get(0);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   517
                    TypeAnnotationPosition p = a.position;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   518
                    p.location = p.location.appendList(depth.toList());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   519
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   520
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   521
                Type ret = typeWithAnnotations(type, enclTy, annotations);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   522
                typetree.type = ret;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   523
                return ret;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   524
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   525
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   526
29842
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
         * Create a copy of the {@code Type type} with the help of the Tree for a type
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   529
         * {@code JCTree typetree} inserting all type annotations in {@code annotations} to the
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   530
         * innermost array component type.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   531
         *
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   532
         * SIDE EFFECT: Update position for the annotations to be {@code pos}.
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   533
         */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   534
        private Type rewriteArrayType(ArrayType type, List<TypeCompound> annotations, TypeAnnotationPosition pos) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   535
            ArrayType tomodify = new ArrayType(type);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   536
            ArrayType res = tomodify;
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
            List<TypePathEntry> loc = List.nil();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   539
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   540
            // peel one and update loc
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   541
            Type tmpType = type.elemtype;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   542
            loc = loc.prepend(TypePathEntry.ARRAY);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   543
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   544
            while (tmpType.hasTag(TypeTag.ARRAY)) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   545
                ArrayType arr = (ArrayType)tmpType;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   546
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   547
                // Update last type with new element type
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   548
                ArrayType tmp = new ArrayType(arr);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   549
                tomodify.elemtype = tmp;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   550
                tomodify = tmp;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   551
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   552
                tmpType = arr.elemtype;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   553
                loc = loc.prepend(TypePathEntry.ARRAY);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   554
            }
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
            // Fix innermost element type
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   557
            Type elemType;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   558
            if (tmpType.getMetadata() != null) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   559
                List<TypeCompound> tcs;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   560
                if (tmpType.getAnnotationMirrors().isEmpty()) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   561
                    tcs = annotations;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   562
                } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   563
                    // Special case, lets prepend
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   564
                    tcs =  annotations.appendList(tmpType.getAnnotationMirrors());
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
                elemType = tmpType.cloneWithMetadata(tmpType
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   567
                        .getMetadata()
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   568
                        .without(Kind.ANNOTATIONS)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   569
                        .combine(new TypeMetadata.Annotations(tcs)));
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   570
            } else {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   571
                elemType = tmpType.cloneWithMetadata(new TypeMetadata(new TypeMetadata.Annotations(annotations)));
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   572
            }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   573
            tomodify.elemtype = elemType;
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
            // Update positions
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   576
            for (TypeCompound tc : annotations) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   577
                if (tc.position == null)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   578
                    tc.position = pos;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   579
                tc.position.location = loc;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   580
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   581
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   582
            return res;
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   583
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   584
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   585
        /** Return a copy of the first type that only differs by
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   586
         * inserting the annotations to the left-most/inner-most type
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   587
         * or the type given by stopAt.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   588
         *
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   589
         * We need the stopAt parameter to know where on a type to
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   590
         * put the annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   591
         * If we have nested classes Outer > Middle > Inner, and we
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   592
         * have the source type "@A Middle.Inner", we will invoke
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   593
         * this method with type = Outer.Middle.Inner,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   594
         * stopAt = Middle.Inner, and annotations = @A.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   595
         *
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   596
         * @param type The type to copy.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   597
         * @param stopAt The type to stop at.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   598
         * @param annotations The annotations to insert.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   599
         * @return A copy of type that contains the annotations.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   600
         */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   601
        private Type typeWithAnnotations(final Type type,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   602
                final Type stopAt,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   603
                final List<Attribute.TypeCompound> annotations) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   604
            Visitor<Type, List<TypeCompound>> visitor =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   605
                    new Type.Visitor<Type, List<Attribute.TypeCompound>>() {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   606
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   607
                public Type visitClassType(ClassType t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   608
                    // assert that t.constValue() == null?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   609
                    if (t == stopAt ||
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   610
                        t.getEnclosingType() == Type.noType) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   611
                        return t.annotatedType(s);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   612
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   613
                        ClassType ret = new ClassType(t.getEnclosingType().accept(this, s),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   614
                                                      t.typarams_field, t.tsym,
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   615
                                                      t.getMetadata());
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   616
                        ret.all_interfaces_field = t.all_interfaces_field;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   617
                        ret.allparams_field = t.allparams_field;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   618
                        ret.interfaces_field = t.interfaces_field;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   619
                        ret.rank_field = t.rank_field;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   620
                        ret.supertype_field = t.supertype_field;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   621
                        return ret;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   622
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   623
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   624
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   625
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   626
                public Type visitWildcardType(WildcardType t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   627
                    return t.annotatedType(s);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   628
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   629
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   630
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   631
                public Type visitArrayType(ArrayType t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   632
                    ArrayType ret = new ArrayType(t.elemtype.accept(this, s), t.tsym,
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   633
                                                  t.getMetadata());
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   634
                    return ret;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   635
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   636
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   637
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   638
                public Type visitMethodType(MethodType t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   639
                    // Impossible?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   640
                    return t;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   641
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   642
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   643
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   644
                public Type visitPackageType(PackageType t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   645
                    // Impossible?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   646
                    return t;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   647
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   648
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   649
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   650
                public Type visitTypeVar(TypeVar t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   651
                    return t.annotatedType(s);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   652
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   653
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   654
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   655
                public Type visitCapturedType(CapturedType t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   656
                    return t.annotatedType(s);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   657
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   658
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   659
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   660
                public Type visitForAll(ForAll t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   661
                    // Impossible?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   662
                    return t;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   663
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   664
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   665
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   666
                public Type visitUndetVar(UndetVar t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   667
                    // Impossible?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   668
                    return t;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   669
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   670
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   671
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   672
                public Type visitErrorType(ErrorType t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   673
                    return t.annotatedType(s);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   674
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   675
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   676
                @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   677
                public Type visitType(Type t, List<TypeCompound> s) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   678
                    return t.annotatedType(s);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   679
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   680
            };
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   681
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   682
            return type.accept(visitor, annotations);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   683
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   684
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   685
        private Attribute.TypeCompound toTypeCompound(Attribute.Compound a, TypeAnnotationPosition p) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   686
            // It is safe to alias the position.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   687
            return new Attribute.TypeCompound(a, p);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   688
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   689
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   690
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   691
        /* This is the beginning of the second part of organizing
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   692
         * type annotations: determine the type annotation positions.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   693
         */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   694
        private TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   695
            resolveFrame(JCTree tree,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   696
                         JCTree frame,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   697
                         List<JCTree> path,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   698
                         JCLambda currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   699
                         int outer_type_index,
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   700
                         ListBuffer<TypePathEntry> location)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   701
        {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   702
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   703
            // Note that p.offset is set in
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   704
            // com.sun.tools.javac.jvm.Gen.setTypeAnnotationPositions(int)
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   705
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   706
            switch (frame.getKind()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   707
                case TYPE_CAST:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   708
                    return TypeAnnotationPosition.typeCast(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   709
                                                           currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   710
                                                           outer_type_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   711
                                                           frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   712
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   713
                case INSTANCE_OF:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   714
                    return TypeAnnotationPosition.instanceOf(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   715
                                                             currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   716
                                                             frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   717
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   718
                case NEW_CLASS:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   719
                    final JCNewClass frameNewClass = (JCNewClass) frame;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   720
                    if (frameNewClass.def != null) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   721
                        // Special handling for anonymous class instantiations
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   722
                        final JCClassDecl frameClassDecl = frameNewClass.def;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   723
                        if (frameClassDecl.implementing.contains(tree)) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   724
                            final int type_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   725
                                frameClassDecl.implementing.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   726
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   727
                                .classExtends(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   728
                                              type_index, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   729
                        } else {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   730
                            //for encl.new @TA Clazz(), tree may be different from frameClassDecl.extending
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   731
                            return TypeAnnotationPosition
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   732
                                .classExtends(location.toList(), currentLambda,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
   733
                                              frame.pos);
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   734
                        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   735
                    } else if (frameNewClass.typeargs.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   736
                        final int type_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   737
                            frameNewClass.typeargs.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   738
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   739
                            .constructorInvocationTypeArg(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   740
                                                          currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   741
                                                          type_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   742
                                                          frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   743
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   744
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   745
                            .newObj(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   746
                                    frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   747
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   748
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   749
                case NEW_ARRAY:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   750
                    return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   751
                        .newObj(location.toList(), currentLambda, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   752
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   753
                case ANNOTATION_TYPE:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   754
                case CLASS:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   755
                case ENUM:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   756
                case INTERFACE:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   757
                    if (((JCClassDecl)frame).extending == tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   758
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   759
                            .classExtends(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   760
                                          frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   761
                    } else if (((JCClassDecl)frame).implementing.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   762
                        final int type_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   763
                            ((JCClassDecl)frame).implementing.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   764
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   765
                            .classExtends(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   766
                                          type_index, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   767
                    } else if (((JCClassDecl)frame).typarams.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   768
                        final int parameter_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   769
                            ((JCClassDecl)frame).typarams.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   770
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   771
                            .typeParameter(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   772
                                           parameter_index, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   773
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   774
                        throw new AssertionError("Could not determine position of tree " +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   775
                                                 tree + " within frame " + frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   776
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   777
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   778
                case METHOD: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   779
                    final JCMethodDecl frameMethod = (JCMethodDecl) frame;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   780
                    if (frameMethod.thrown.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   781
                        final int type_index = frameMethod.thrown.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   782
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   783
                            .methodThrows(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   784
                                          type_index, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   785
                    } else if (frameMethod.restype == tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   786
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   787
                            .methodReturn(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   788
                                          frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   789
                    } else if (frameMethod.typarams.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   790
                        final int parameter_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   791
                            frameMethod.typarams.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   792
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   793
                            .methodTypeParameter(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   794
                                                 currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   795
                                                 parameter_index, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   796
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   797
                        throw new AssertionError("Could not determine position of tree " + tree +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   798
                                                 " within frame " + frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   799
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   800
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   801
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   802
                case PARAMETERIZED_TYPE: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   803
                    List<JCTree> newPath = path.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   804
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   805
                    if (((JCTypeApply)frame).clazz == tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   806
                        // generic: RAW; noop
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   807
                    } else if (((JCTypeApply)frame).arguments.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   808
                        JCTypeApply taframe = (JCTypeApply) frame;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   809
                        int arg = taframe.arguments.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   810
                        location = location.prepend(
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   811
                            new TypePathEntry(TypePathEntryKind.TYPE_ARGUMENT,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   812
                                              arg));
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   813
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   814
                        Type typeToUse;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   815
                        if (newPath.tail != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   816
                            newPath.tail.head.hasTag(Tag.NEWCLASS)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   817
                            // If we are within an anonymous class
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   818
                            // instantiation, use its type, because it
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   819
                            // contains a correctly nested type.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   820
                            typeToUse = newPath.tail.head.type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   821
                        } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   822
                            typeToUse = taframe.type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   823
                        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   824
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   825
                        location = locateNestedTypes(typeToUse, location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   826
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   827
                        throw new AssertionError("Could not determine type argument position of tree " + tree +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   828
                                                 " within frame " + frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   829
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   830
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   831
                    return resolveFrame(newPath.head, newPath.tail.head,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   832
                                        newPath, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   833
                                        outer_type_index, location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   834
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   835
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   836
                case MEMBER_REFERENCE: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   837
                    JCMemberReference mrframe = (JCMemberReference) frame;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   838
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   839
                    if (mrframe.expr == tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   840
                        switch (mrframe.mode) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   841
                        case INVOKE:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   842
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   843
                                .methodRef(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   844
                                           frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   845
                        case NEW:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   846
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   847
                                .constructorRef(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   848
                                                currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   849
                                                frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   850
                        default:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   851
                            throw new AssertionError("Unknown method reference mode " + mrframe.mode +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   852
                                                     " for tree " + tree + " within frame " + frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   853
                        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   854
                    } else if (mrframe.typeargs != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   855
                            mrframe.typeargs.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   856
                        final int type_index = mrframe.typeargs.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   857
                        switch (mrframe.mode) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   858
                        case INVOKE:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   859
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   860
                                .methodRefTypeArg(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   861
                                                  currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   862
                                                  type_index, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   863
                        case NEW:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   864
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   865
                                .constructorRefTypeArg(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   866
                                                       currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   867
                                                       type_index, frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   868
                        default:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   869
                            throw new AssertionError("Unknown method reference mode " + mrframe.mode +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   870
                                                   " for tree " + tree + " within frame " + frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   871
                        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   872
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   873
                        throw new AssertionError("Could not determine type argument position of tree " + tree +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   874
                                               " within frame " + frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   875
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   876
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   877
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   878
                case ARRAY_TYPE: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   879
                    location = location.prepend(TypePathEntry.ARRAY);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   880
                    List<JCTree> newPath = path.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   881
                    while (true) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   882
                        JCTree npHead = newPath.tail.head;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   883
                        if (npHead.hasTag(JCTree.Tag.TYPEARRAY)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   884
                            newPath = newPath.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   885
                            location = location.prepend(TypePathEntry.ARRAY);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   886
                        } else if (npHead.hasTag(JCTree.Tag.ANNOTATED_TYPE)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   887
                            newPath = newPath.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   888
                        } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   889
                            break;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   890
                        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   891
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   892
                    return resolveFrame(newPath.head, newPath.tail.head,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   893
                                        newPath, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   894
                                        outer_type_index, location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   895
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   896
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   897
                case TYPE_PARAMETER:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   898
                    if (path.tail.tail.head.hasTag(JCTree.Tag.CLASSDEF)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   899
                        final JCClassDecl clazz =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   900
                            (JCClassDecl)path.tail.tail.head;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   901
                        final int parameter_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   902
                            clazz.typarams.indexOf(path.tail.head);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   903
                        final int bound_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   904
                            ((JCTypeParameter)frame).bounds.get(0)
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   905
                            .type.isInterface() ?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   906
                            ((JCTypeParameter)frame).bounds.indexOf(tree) + 1:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   907
                            ((JCTypeParameter)frame).bounds.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   908
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   909
                            .typeParameterBound(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   910
                                                currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   911
                                                parameter_index, bound_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   912
                                                frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   913
                    } else if (path.tail.tail.head.hasTag(JCTree.Tag.METHODDEF)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   914
                        final JCMethodDecl method =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   915
                            (JCMethodDecl)path.tail.tail.head;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   916
                        final int parameter_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   917
                            method.typarams.indexOf(path.tail.head);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   918
                        final int bound_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   919
                            ((JCTypeParameter)frame).bounds.get(0)
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   920
                            .type.isInterface() ?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   921
                            ((JCTypeParameter)frame).bounds.indexOf(tree) + 1:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   922
                            ((JCTypeParameter)frame).bounds.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   923
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   924
                            .methodTypeParameterBound(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   925
                                                      currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   926
                                                      parameter_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   927
                                                      bound_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   928
                                                      frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   929
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   930
                        throw new AssertionError("Could not determine position of tree " + tree +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   931
                                                 " within frame " + frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   932
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   933
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   934
                case VARIABLE:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   935
                    VarSymbol v = ((JCVariableDecl)frame).sym;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   936
                    if (v.getKind() != ElementKind.FIELD) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   937
                        v.owner.appendUniqueTypeAttributes(v.getRawTypeAttributes());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   938
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   939
                    switch (v.getKind()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   940
                        case LOCAL_VARIABLE:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   941
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   942
                                .localVariable(location.toList(), currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   943
                                               frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   944
                        case FIELD:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   945
                            return TypeAnnotationPosition.field(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   946
                                                                currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   947
                                                                frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   948
                        case PARAMETER:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   949
                            if (v.getQualifiedName().equals(names._this)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   950
                                return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   951
                                    .methodReceiver(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   952
                                                    currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   953
                                                    frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   954
                            } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   955
                                final int parameter_index =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   956
                                    methodParamIndex(path, frame);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   957
                                return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   958
                                    .methodParameter(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   959
                                                     currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   960
                                                     parameter_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   961
                                                     frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   962
                            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   963
                        case EXCEPTION_PARAMETER:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   964
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   965
                                .exceptionParameter(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   966
                                                    currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   967
                                                    frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   968
                        case RESOURCE_VARIABLE:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   969
                            return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   970
                                .resourceVariable(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   971
                                                  currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   972
                                                  frame.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   973
                        default:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   974
                            throw new AssertionError("Found unexpected type annotation for variable: " + v + " with kind: " + v.getKind());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   975
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   976
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   977
                case ANNOTATED_TYPE: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   978
                    if (frame == tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   979
                        // This is only true for the first annotated type we see.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   980
                        // For any other annotated types along the path, we do
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   981
                        // not care about inner types.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   982
                        JCAnnotatedType atypetree = (JCAnnotatedType) frame;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   983
                        final Type utype = atypetree.underlyingType.type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   984
                        Assert.checkNonNull(utype);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   985
                        Symbol tsym = utype.tsym;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   986
                        if (tsym.getKind().equals(ElementKind.TYPE_PARAMETER) ||
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   987
                                utype.getKind().equals(TypeKind.WILDCARD) ||
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   988
                                utype.getKind().equals(TypeKind.ARRAY)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   989
                            // Type parameters, wildcards, and arrays have the declaring
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   990
                            // class/method as enclosing elements.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   991
                            // There is actually nothing to do for them.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   992
                        } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   993
                            location = locateNestedTypes(utype, location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   994
                        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   995
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   996
                    List<JCTree> newPath = path.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   997
                    return resolveFrame(newPath.head, newPath.tail.head,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   998
                                        newPath, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
   999
                                        outer_type_index, location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1000
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1001
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1002
                case UNION_TYPE: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1003
                    List<JCTree> newPath = path.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1004
                    return resolveFrame(newPath.head, newPath.tail.head,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1005
                                        newPath, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1006
                                        outer_type_index, location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1007
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1008
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1009
                case INTERSECTION_TYPE: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1010
                    JCTypeIntersection isect = (JCTypeIntersection)frame;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1011
                    final List<JCTree> newPath = path.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1012
                    return resolveFrame(newPath.head, newPath.tail.head,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1013
                                        newPath, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1014
                                        isect.bounds.indexOf(tree), location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1015
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1016
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1017
                case METHOD_INVOCATION: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1018
                    JCMethodInvocation invocation = (JCMethodInvocation)frame;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1019
                    if (!invocation.typeargs.contains(tree)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1020
                        throw new AssertionError("{" + tree + "} is not an argument in the invocation: " + invocation);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1021
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1022
                    MethodSymbol exsym = (MethodSymbol) TreeInfo.symbol(invocation.getMethodSelect());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1023
                    final int type_index = invocation.typeargs.indexOf(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1024
                    if (exsym == null) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1025
                        throw new AssertionError("could not determine symbol for {" + invocation + "}");
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1026
                    } else if (exsym.isConstructor()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1027
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1028
                            .constructorInvocationTypeArg(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1029
                                                          currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1030
                                                          type_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1031
                                                          invocation.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1032
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1033
                        return TypeAnnotationPosition
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1034
                            .methodInvocationTypeArg(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1035
                                                     currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1036
                                                     type_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1037
                                                     invocation.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1038
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1039
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1040
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1041
                case EXTENDS_WILDCARD:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1042
                case SUPER_WILDCARD: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1043
                    // Annotations in wildcard bounds
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1044
                    final List<JCTree> newPath = path.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1045
                    return resolveFrame(newPath.head, newPath.tail.head,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1046
                                        newPath, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1047
                                        outer_type_index,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1048
                                        location.prepend(TypePathEntry.WILDCARD));
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1049
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1050
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1051
                case MEMBER_SELECT: {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1052
                    final List<JCTree> newPath = path.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1053
                    return resolveFrame(newPath.head, newPath.tail.head,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1054
                                        newPath, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1055
                                        outer_type_index, location);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1056
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1057
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1058
                default:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1059
                    throw new AssertionError("Unresolved frame: " + frame +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1060
                                             " of kind: " + frame.getKind() +
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1061
                                             "\n    Looking for tree: " + tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1062
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1063
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1064
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1065
        private ListBuffer<TypePathEntry>
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1066
            locateNestedTypes(Type type,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1067
                              ListBuffer<TypePathEntry> depth) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1068
            Type encl = type.getEnclosingType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1069
            while (encl != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1070
                    encl.getKind() != TypeKind.NONE &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1071
                    encl.getKind() != TypeKind.ERROR) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1072
                depth = depth.prepend(TypePathEntry.INNER_TYPE);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1073
                encl = encl.getEnclosingType();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1074
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1075
            return depth;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1076
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1077
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1078
        private int methodParamIndex(List<JCTree> path, JCTree param) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1079
            List<JCTree> curr = path;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1080
            while (curr.head.getTag() != Tag.METHODDEF &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1081
                    curr.head.getTag() != Tag.LAMBDA) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1082
                curr = curr.tail;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1083
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1084
            if (curr.head.getTag() == Tag.METHODDEF) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1085
                JCMethodDecl method = (JCMethodDecl)curr.head;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1086
                return method.params.indexOf(param);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1087
            } else if (curr.head.getTag() == Tag.LAMBDA) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1088
                JCLambda lambda = (JCLambda)curr.head;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1089
                return lambda.params.indexOf(param);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1090
            } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1091
                Assert.error("methodParamIndex expected to find method or lambda for param: " + param);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1092
                return -1;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1093
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1094
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1095
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1096
        // Each class (including enclosed inner classes) is visited separately.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1097
        // This flag is used to prevent from visiting inner classes.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1098
        private boolean isInClass = false;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1099
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1100
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1101
        public void visitClassDef(JCClassDecl tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1102
            if (isInClass)
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1103
                return;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1104
            isInClass = true;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1105
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1106
            if (sigOnly) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1107
                scan(tree.mods);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1108
                scan(tree.typarams);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1109
                scan(tree.extending);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1110
                scan(tree.implementing);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1111
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1112
            scan(tree.defs);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1113
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1114
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1115
        /**
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1116
         * Resolve declaration vs. type annotations in methods and
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1117
         * then determine the positions.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1118
         */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1119
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1120
        public void visitMethodDef(final JCMethodDecl tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1121
            if (tree.sym == null) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1122
                Assert.error("Visiting tree node before memberEnter");
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1123
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1124
            if (sigOnly) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1125
                if (!tree.mods.annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1126
                    if (tree.sym.isConstructor()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1127
                        final TypeAnnotationPosition pos =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1128
                            TypeAnnotationPosition.methodReturn(tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1129
                        // Use null to mark that the annotations go
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1130
                        // with the symbol.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1131
                        separateAnnotationsKinds(tree, null, tree.sym, pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1132
                    } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1133
                        final TypeAnnotationPosition pos =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1134
                            TypeAnnotationPosition.methodReturn(tree.restype.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1135
                        separateAnnotationsKinds(tree.restype,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1136
                                                 tree.sym.type.getReturnType(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1137
                                                 tree.sym, pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1138
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1139
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1140
                if (tree.recvparam != null && tree.recvparam.sym != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1141
                        !tree.recvparam.mods.annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1142
                    // Nothing to do for separateAnnotationsKinds if
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1143
                    // there are no annotations of either kind.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1144
                    // TODO: make sure there are no declaration annotations.
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1145
                    final TypeAnnotationPosition pos = TypeAnnotationPosition.methodReceiver(tree.recvparam.vartype.pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1146
                    push(tree.recvparam);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1147
                    try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1148
                        separateAnnotationsKinds(tree.recvparam.vartype, tree.recvparam.sym.type, tree.recvparam.sym, pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1149
                    } finally {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1150
                        pop();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1151
                    }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1152
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1153
                int i = 0;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1154
                for (JCVariableDecl param : tree.params) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1155
                    if (!param.mods.annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1156
                        // Nothing to do for separateAnnotationsKinds if
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1157
                        // there are no annotations of either kind.
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1158
                        final TypeAnnotationPosition pos = TypeAnnotationPosition.methodParameter(i, param.vartype.pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1159
                        push(param);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1160
                        try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1161
                            separateAnnotationsKinds(param.vartype, param.sym.type, param.sym, pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1162
                        } finally {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1163
                            pop();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1164
                        }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1165
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1166
                    ++i;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1167
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1168
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1169
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1170
            if (sigOnly) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1171
                scan(tree.mods);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1172
                scan(tree.restype);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1173
                scan(tree.typarams);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1174
                scan(tree.recvparam);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1175
                scan(tree.params);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1176
                scan(tree.thrown);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1177
            } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1178
                scan(tree.defaultValue);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1179
                scan(tree.body);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1180
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1181
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1182
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1183
        /* Store a reference to the current lambda expression, to
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1184
         * be used by all type annotations within this expression.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1185
         */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1186
        private JCLambda currentLambda = null;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1187
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1188
        public void visitLambda(JCLambda tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1189
            JCLambda prevLambda = currentLambda;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1190
            try {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1191
                currentLambda = tree;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1192
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1193
                int i = 0;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1194
                for (JCVariableDecl param : tree.params) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1195
                    if (!param.mods.annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1196
                        // Nothing to do for separateAnnotationsKinds if
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1197
                        // there are no annotations of either kind.
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1198
                        final TypeAnnotationPosition pos =  TypeAnnotationPosition
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1199
                                .methodParameter(tree, i, param.vartype.pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1200
                        push(param);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1201
                        try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1202
                            separateAnnotationsKinds(param.vartype, param.sym.type, param.sym, pos);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1203
                        } finally {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1204
                            pop();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1205
                        }
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1206
                    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1207
                    ++i;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1208
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1209
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1210
                scan(tree.body);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1211
                scan(tree.params);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1212
            } finally {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1213
                currentLambda = prevLambda;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1214
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1215
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1216
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1217
        /**
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1218
         * Resolve declaration vs. type annotations in variable declarations and
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1219
         * then determine the positions.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1220
         */
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1221
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1222
        public void visitVarDef(final JCVariableDecl tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1223
            if (tree.mods.annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1224
                // Nothing to do for separateAnnotationsKinds if
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1225
                // there are no annotations of either kind.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1226
            } else if (tree.sym == null) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1227
                Assert.error("Visiting tree node before memberEnter");
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1228
            } else if (tree.sym.getKind() == ElementKind.PARAMETER) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1229
                // Parameters are handled in visitMethodDef or visitLambda.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1230
            } else if (tree.sym.getKind() == ElementKind.FIELD) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1231
                if (sigOnly) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1232
                    TypeAnnotationPosition pos =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1233
                        TypeAnnotationPosition.field(tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1234
                    separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1235
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1236
            } else if (tree.sym.getKind() == ElementKind.LOCAL_VARIABLE) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1237
                final TypeAnnotationPosition pos =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1238
                    TypeAnnotationPosition.localVariable(currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1239
                                                         tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1240
                separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1241
            } else if (tree.sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1242
                final TypeAnnotationPosition pos =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1243
                    TypeAnnotationPosition.exceptionParameter(currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1244
                                                              tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1245
                separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1246
            } else if (tree.sym.getKind() == ElementKind.RESOURCE_VARIABLE) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1247
                final TypeAnnotationPosition pos =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1248
                    TypeAnnotationPosition.resourceVariable(currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1249
                                                            tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1250
                separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1251
            } else if (tree.sym.getKind() == ElementKind.ENUM_CONSTANT) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1252
                // No type annotations can occur here.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1253
            } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1254
                // There is nothing else in a variable declaration that needs separation.
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1255
                Assert.error("Unhandled variable kind");
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1256
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1257
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1258
            scan(tree.mods);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1259
            scan(tree.vartype);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1260
            if (!sigOnly) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1261
                scan(tree.init);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1262
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1263
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1264
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1265
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1266
        public void visitBlock(JCBlock tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1267
            // Do not descend into top-level blocks when only interested
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1268
            // in the signature.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1269
            if (!sigOnly) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1270
                scan(tree.stats);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1271
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1272
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1273
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1274
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1275
        public void visitAnnotatedType(JCAnnotatedType tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1276
            push(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1277
            findPosition(tree, tree, tree.annotations);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1278
            pop();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1279
            super.visitAnnotatedType(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1280
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1281
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1282
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1283
        public void visitTypeParameter(JCTypeParameter tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1284
            findPosition(tree, peek2(), tree.annotations);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1285
            super.visitTypeParameter(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1286
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1287
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1288
        private void copyNewClassAnnotationsToOwner(JCNewClass tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1289
            Symbol sym = tree.def.sym;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1290
            final TypeAnnotationPosition pos =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1291
                TypeAnnotationPosition.newObj(tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1292
            ListBuffer<Attribute.TypeCompound> newattrs = new ListBuffer<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1293
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1294
            for (Attribute.TypeCompound old : sym.getRawTypeAttributes()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1295
                newattrs.append(new Attribute.TypeCompound(old.type, old.values,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1296
                                                           pos));
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1297
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1298
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1299
            sym.owner.appendUniqueTypeAttributes(newattrs.toList());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1300
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1301
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1302
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1303
        public void visitNewClass(JCNewClass tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1304
            if (tree.def != null &&
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1305
                    !tree.def.mods.annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1306
                JCClassDecl classdecl = tree.def;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1307
                TypeAnnotationPosition pos;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1308
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1309
                if (classdecl.extending == tree.clazz) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1310
                    pos = TypeAnnotationPosition.classExtends(tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1311
                } else if (classdecl.implementing.contains(tree.clazz)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1312
                    final int index = classdecl.implementing.indexOf(tree.clazz);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1313
                    pos = TypeAnnotationPosition.classExtends(index, tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1314
                } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1315
                    // In contrast to CLASS elsewhere, typarams cannot occur here.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1316
                    throw new AssertionError("Could not determine position of tree " + tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1317
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1318
                Type before = classdecl.sym.type;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1319
                separateAnnotationsKinds(classdecl, tree.clazz.type, classdecl.sym, pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1320
                copyNewClassAnnotationsToOwner(tree);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1321
                // classdecl.sym.type now contains an annotated type, which
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1322
                // is not what we want there.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1323
                // TODO: should we put this type somewhere in the superclass/interface?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1324
                classdecl.sym.type = before;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1325
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1326
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1327
            scan(tree.encl);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1328
            scan(tree.typeargs);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1329
            scan(tree.clazz);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1330
            scan(tree.args);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1331
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1332
            // The class body will already be scanned.
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1333
            // scan(tree.def);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1334
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1335
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1336
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1337
        public void visitNewArray(JCNewArray tree) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1338
            findPosition(tree, tree, tree.annotations);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1339
            int dimAnnosCount = tree.dimAnnotations.size();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1340
            ListBuffer<TypePathEntry> depth = new ListBuffer<>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1341
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1342
            // handle annotations associated with dimensions
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1343
            for (int i = 0; i < dimAnnosCount; ++i) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1344
                ListBuffer<TypePathEntry> location =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1345
                    new ListBuffer<TypePathEntry>();
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1346
                if (i != 0) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1347
                    depth = depth.append(TypePathEntry.ARRAY);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1348
                    location = location.appendList(depth.toList());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1349
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1350
                final TypeAnnotationPosition p =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1351
                    TypeAnnotationPosition.newObj(location.toList(),
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1352
                                                  currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1353
                                                  tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1354
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1355
                setTypeAnnotationPos(tree.dimAnnotations.get(i), p);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1356
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1357
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1358
            // handle "free" annotations
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1359
            // int i = dimAnnosCount == 0 ? 0 : dimAnnosCount - 1;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1360
            // TODO: is depth.size == i here?
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1361
            JCExpression elemType = tree.elemtype;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1362
            depth = depth.append(TypePathEntry.ARRAY);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1363
            while (elemType != null) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1364
                if (elemType.hasTag(JCTree.Tag.ANNOTATED_TYPE)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1365
                    JCAnnotatedType at = (JCAnnotatedType)elemType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1366
                    final ListBuffer<TypePathEntry> locationbuf =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1367
                        locateNestedTypes(elemType.type,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1368
                                          new ListBuffer<TypePathEntry>());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1369
                    final List<TypePathEntry> location =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1370
                        locationbuf.toList().prependList(depth.toList());
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1371
                    final TypeAnnotationPosition p =
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1372
                        TypeAnnotationPosition.newObj(location, currentLambda,
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1373
                                                      tree.pos);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1374
                    setTypeAnnotationPos(at.annotations, p);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1375
                    elemType = at.underlyingType;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1376
                } else if (elemType.hasTag(JCTree.Tag.TYPEARRAY)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1377
                    depth = depth.append(TypePathEntry.ARRAY);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1378
                    elemType = ((JCArrayTypeTree)elemType).elemtype;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1379
                } else if (elemType.hasTag(JCTree.Tag.SELECT)) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1380
                    elemType = ((JCFieldAccess)elemType).selected;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1381
                } else {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1382
                    break;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1383
                }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1384
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1385
            scan(tree.elems);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1386
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1387
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1388
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1389
        private void findTypeCompoundPosition(JCTree tree, JCTree frame, List<Attribute.TypeCompound> annotations) {
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1390
            if (!annotations.isEmpty()) {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1391
                final TypeAnnotationPosition p =
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1392
                        resolveFrame(tree, frame, frames, currentLambda, 0, new ListBuffer<>());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1393
                for (TypeCompound tc : annotations)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1394
                    tc.position = p;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1395
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1396
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1397
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1398
        private void findPosition(JCTree tree, JCTree frame, List<JCAnnotation> annotations) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1399
            if (!annotations.isEmpty())
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1400
            {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1401
                final TypeAnnotationPosition p =
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1402
                    resolveFrame(tree, frame, frames, currentLambda, 0, new ListBuffer<>());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1403
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1404
                setTypeAnnotationPos(annotations, p);
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1405
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1406
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1407
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1408
        private void setTypeAnnotationPos(List<JCAnnotation> annotations, TypeAnnotationPosition position)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1409
        {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1410
            // attribute might be null during DeferredAttr;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1411
            // we will be back later.
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1412
            for (JCAnnotation anno : annotations) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1413
                if (anno.attribute != null)
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1414
                    ((Attribute.TypeCompound) anno.attribute).position = position;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1415
            }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1416
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1417
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27224
diff changeset
  1418
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1419
        @Override
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1420
        public String toString() {
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1421
            return super.toString() + ": sigOnly: " + sigOnly;
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1422
        }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1423
    }
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents:
diff changeset
  1424
}