langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
author jjg
Sun, 18 May 2014 19:59:10 -0700
changeset 24604 7f68545b5128
parent 24403 f2ce14657001
child 24606 12c0ca21f8dc
permissions -rw-r--r--
8041422: Split javac ClassReader into ClassReader+ClassFinder Reviewed-by: jfranck
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
     2
 * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5012
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5012
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5012
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5012
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5012
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
06bc494ca11e Initial load
duke
parents:
diff changeset
    26
package com.sun.tools.javac.jvm;
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
06bc494ca11e Initial load
duke
parents:
diff changeset
    28
import java.io.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    29
import java.net.URI;
3782
ae62279eeb46 6419701: DefaultFileManager clean up: URI.create
jjg
parents: 3149
diff changeset
    30
import java.net.URISyntaxException;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    31
import java.nio.CharBuffer;
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
    32
import java.util.Arrays;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    33
import java.util.EnumSet;
06bc494ca11e Initial load
duke
parents:
diff changeset
    34
import java.util.HashMap;
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
    35
import java.util.HashSet;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    36
import java.util.Map;
06bc494ca11e Initial load
duke
parents:
diff changeset
    37
import java.util.Set;
06bc494ca11e Initial load
duke
parents:
diff changeset
    38
import javax.tools.JavaFileObject;
06bc494ca11e Initial load
duke
parents:
diff changeset
    39
import javax.tools.JavaFileManager;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
    40
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    41
import com.sun.tools.javac.comp.Annotate;
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
import com.sun.tools.javac.code.*;
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
    43
import com.sun.tools.javac.code.Lint.LintCategory;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    44
import com.sun.tools.javac.code.Type.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    45
import com.sun.tools.javac.code.Symbol.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    46
import com.sun.tools.javac.code.Symtab;
731
1dd22bdb9ca5 6714364: refactor javac File handling code into new javac.file package
jjg
parents: 169
diff changeset
    47
import com.sun.tools.javac.file.BaseFileObject;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    48
import com.sun.tools.javac.util.*;
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
    49
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    50
06bc494ca11e Initial load
duke
parents:
diff changeset
    51
import static com.sun.tools.javac.code.Flags.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    52
import static com.sun.tools.javac.code.Kinds.*;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 13689
diff changeset
    53
import static com.sun.tools.javac.code.TypeTag.CLASS;
20242
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
    54
import static com.sun.tools.javac.code.TypeTag.TYPEVAR;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
    55
import static com.sun.tools.javac.jvm.ClassFile.*;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
    56
import static com.sun.tools.javac.jvm.ClassFile.Version.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    57
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 11053
diff changeset
    58
import static com.sun.tools.javac.main.Option.*;
6721
d92073844278 6988436: Cleanup javac option handling
jjg
parents: 6709
diff changeset
    59
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    60
/** This class provides operations to read a classfile into an internal
06bc494ca11e Initial load
duke
parents:
diff changeset
    61
 *  representation. The internal representation is anchored in a
06bc494ca11e Initial load
duke
parents:
diff changeset
    62
 *  ClassSymbol which contains in its scope symbol representations
06bc494ca11e Initial load
duke
parents:
diff changeset
    63
 *  for all other definitions in the classfile. Top-level Classes themselves
06bc494ca11e Initial load
duke
parents:
diff changeset
    64
 *  appear as members of the scopes of PackageSymbols.
06bc494ca11e Initial load
duke
parents:
diff changeset
    65
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    66
 *  <p><b>This is NOT part of any supported API.
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    67
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    68
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    69
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    70
 */
19921
58bcbe156057 8023974: Drop 'implements Completer' and 'implements SourceCompleter' from ClassReader resp. JavaCompiler.
jfranck
parents: 19915
diff changeset
    71
public class ClassReader {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
    /** The context key for the class reader. */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
    73
    protected static final Context.Key<ClassReader> classReaderKey = new Context.Key<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    74
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
    75
    public static final int INITIAL_BUFFER_SIZE = 0x0fff0;
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
    76
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
    Annotate annotate;
06bc494ca11e Initial load
duke
parents:
diff changeset
    78
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
    /** Switch: verbose output.
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
    boolean verbose;
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
    /** Switch: check class file for correct minor version, unrecognized
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
     *  attributes.
06bc494ca11e Initial load
duke
parents:
diff changeset
    85
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
    boolean checkClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
06bc494ca11e Initial load
duke
parents:
diff changeset
    88
    /** Switch: read constant pool and code sections. This switch is initially
06bc494ca11e Initial load
duke
parents:
diff changeset
    89
     *  set to false but can be turned on from outside.
06bc494ca11e Initial load
duke
parents:
diff changeset
    90
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    91
    public boolean readAllOfClassFile = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
    92
06bc494ca11e Initial load
duke
parents:
diff changeset
    93
    /** Switch: read GJ signature information.
06bc494ca11e Initial load
duke
parents:
diff changeset
    94
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    95
    boolean allowGenerics;
06bc494ca11e Initial load
duke
parents:
diff changeset
    96
06bc494ca11e Initial load
duke
parents:
diff changeset
    97
    /** Switch: read varargs attribute.
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
    boolean allowVarargs;
06bc494ca11e Initial load
duke
parents:
diff changeset
   100
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
    /** Switch: allow annotations.
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   103
    boolean allowAnnotations;
06bc494ca11e Initial load
duke
parents:
diff changeset
   104
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
   105
    /** Switch: allow simplified varargs.
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
   106
     */
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
   107
    boolean allowSimplifiedVarargs;
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
   108
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
   109
   /** Lint option: warn about classfile issues
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   110
     */
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   111
    boolean lintClassfile;
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   112
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   113
    /** Switch: preserve parameter names from the variable table.
06bc494ca11e Initial load
duke
parents:
diff changeset
   114
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   115
    public boolean saveParameterNames;
06bc494ca11e Initial load
duke
parents:
diff changeset
   116
06bc494ca11e Initial load
duke
parents:
diff changeset
   117
    /**
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   118
     * The currently selected profile.
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   119
     */
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   120
    public final Profile profile;
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   121
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   122
    /** The log to use for verbose output
06bc494ca11e Initial load
duke
parents:
diff changeset
   123
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   124
    final Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
   125
06bc494ca11e Initial load
duke
parents:
diff changeset
   126
    /** The symbol table. */
06bc494ca11e Initial load
duke
parents:
diff changeset
   127
    Symtab syms;
06bc494ca11e Initial load
duke
parents:
diff changeset
   128
06bc494ca11e Initial load
duke
parents:
diff changeset
   129
    Types types;
06bc494ca11e Initial load
duke
parents:
diff changeset
   130
06bc494ca11e Initial load
duke
parents:
diff changeset
   131
    /** The name table. */
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 939
diff changeset
   132
    final Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   133
06bc494ca11e Initial load
duke
parents:
diff changeset
   134
    /** Access to files
06bc494ca11e Initial load
duke
parents:
diff changeset
   135
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   136
    private final JavaFileManager fileManager;
06bc494ca11e Initial load
duke
parents:
diff changeset
   137
169
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   138
    /** Factory for diagnostics
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   139
     */
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   140
    JCDiagnostic.Factory diagFactory;
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   141
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   142
    /** The current scope where type variables are entered.
06bc494ca11e Initial load
duke
parents:
diff changeset
   143
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   144
    protected Scope typevars;
06bc494ca11e Initial load
duke
parents:
diff changeset
   145
06bc494ca11e Initial load
duke
parents:
diff changeset
   146
    /** The path name of the class file currently being read.
06bc494ca11e Initial load
duke
parents:
diff changeset
   147
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   148
    protected JavaFileObject currentClassFile = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   149
06bc494ca11e Initial load
duke
parents:
diff changeset
   150
    /** The class or method currently being read.
06bc494ca11e Initial load
duke
parents:
diff changeset
   151
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   152
    protected Symbol currentOwner = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   153
06bc494ca11e Initial load
duke
parents:
diff changeset
   154
    /** The buffer containing the currently read class file.
06bc494ca11e Initial load
duke
parents:
diff changeset
   155
     */
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
   156
    byte[] buf = new byte[INITIAL_BUFFER_SIZE];
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   157
06bc494ca11e Initial load
duke
parents:
diff changeset
   158
    /** The current input pointer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   159
     */
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   160
    protected int bp;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   161
06bc494ca11e Initial load
duke
parents:
diff changeset
   162
    /** The objects of the constant pool.
06bc494ca11e Initial load
duke
parents:
diff changeset
   163
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   164
    Object[] poolObj;
06bc494ca11e Initial load
duke
parents:
diff changeset
   165
06bc494ca11e Initial load
duke
parents:
diff changeset
   166
    /** For every constant pool entry, an index into buf where the
06bc494ca11e Initial load
duke
parents:
diff changeset
   167
     *  defining section of the entry is found.
06bc494ca11e Initial load
duke
parents:
diff changeset
   168
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   169
    int[] poolIdx;
06bc494ca11e Initial load
duke
parents:
diff changeset
   170
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   171
    /** The major version number of the class file being read. */
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   172
    int majorVersion;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   173
    /** The minor version number of the class file being read. */
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   174
    int minorVersion;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   175
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   176
    /** A table to hold the constant pool indices for method parameter
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   177
     * names, as given in LocalVariableTable attributes.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   178
     */
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   179
    int[] parameterNameIndices;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   180
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   181
    /**
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   182
     * Whether or not any parameter names have been found.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   183
     */
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   184
    boolean haveParameterNameIndices;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   185
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   186
    /** Set this to false every time we start reading a method
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   187
     * and are saving parameter names.  Set it to true when we see
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   188
     * MethodParameters, if it's set when we see a LocalVariableTable,
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   189
     * then we ignore the parameter names from the LVT.
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   190
     */
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   191
    boolean sawMethodParameters;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   192
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   193
    /**
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   194
     * The set of attribute names for which warnings have been generated for the current class
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   195
     */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
   196
    Set<Name> warnedAttrs = new HashSet<>();
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   197
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   198
    /** Get the ClassReader instance for this invocation. */
06bc494ca11e Initial load
duke
parents:
diff changeset
   199
    public static ClassReader instance(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   200
        ClassReader instance = context.get(classReaderKey);
06bc494ca11e Initial load
duke
parents:
diff changeset
   201
        if (instance == null)
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   202
            instance = new ClassReader(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   203
        return instance;
06bc494ca11e Initial load
duke
parents:
diff changeset
   204
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   205
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   206
    /** Construct a new class reader. */
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   207
    protected ClassReader(Context context) {
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   208
        context.put(classReaderKey, this);
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 939
diff changeset
   209
        names = Names.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   210
        syms = Symtab.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   211
        types = Types.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   212
        fileManager = context.get(JavaFileManager.class);
06bc494ca11e Initial load
duke
parents:
diff changeset
   213
        if (fileManager == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   214
            throw new AssertionError("FileManager initialization error");
169
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   215
        diagFactory = JCDiagnostic.Factory.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   216
06bc494ca11e Initial load
duke
parents:
diff changeset
   217
        log = Log.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   218
06bc494ca11e Initial load
duke
parents:
diff changeset
   219
        Options options = Options.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   220
        annotate = Annotate.instance(context);
6721
d92073844278 6988436: Cleanup javac option handling
jjg
parents: 6709
diff changeset
   221
        verbose        = options.isSet(VERBOSE);
d92073844278 6988436: Cleanup javac option handling
jjg
parents: 6709
diff changeset
   222
        checkClassFile = options.isSet("-checkclassfile");
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   223
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   224
        Source source = Source.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   225
        allowGenerics    = source.allowGenerics();
06bc494ca11e Initial load
duke
parents:
diff changeset
   226
        allowVarargs     = source.allowVarargs();
06bc494ca11e Initial load
duke
parents:
diff changeset
   227
        allowAnnotations = source.allowAnnotations();
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
   228
        allowSimplifiedVarargs = source.allowSimplifiedVarargs();
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   229
6721
d92073844278 6988436: Cleanup javac option handling
jjg
parents: 6709
diff changeset
   230
        saveParameterNames = options.isSet("save-parameter-names");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   231
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   232
        profile = Profile.instance(context);
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   233
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   234
        typevars = new Scope(syms.noSymbol);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   235
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   236
        lintClassfile = Lint.instance(context).isEnabled(LintCategory.CLASSFILE);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   237
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   238
        initAttributeReaders();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   239
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   240
06bc494ca11e Initial load
duke
parents:
diff changeset
   241
    /** Add member to class unless it is synthetic.
06bc494ca11e Initial load
duke
parents:
diff changeset
   242
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   243
    private void enterMember(ClassSymbol c, Symbol sym) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15718
diff changeset
   244
        // Synthetic members are not entered -- reason lost to history (optimization?).
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15718
diff changeset
   245
        // Lambda methods must be entered because they may have inner classes (which reference them)
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15718
diff changeset
   246
        if ((sym.flags_field & (SYNTHETIC|BRIDGE)) != SYNTHETIC || sym.name.startsWith(names.lambda))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   247
            c.members_field.enter(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   248
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   249
06bc494ca11e Initial load
duke
parents:
diff changeset
   250
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   251
 * Error Diagnoses
06bc494ca11e Initial load
duke
parents:
diff changeset
   252
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   253
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
   254
    public ClassFinder.BadClassFile badClassFile(String key, Object... args) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
   255
        return new ClassFinder.BadClassFile (
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   256
            currentOwner.enclClass(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   257
            currentClassFile,
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
   258
            diagFactory.fragment(key, args),
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
   259
            diagFactory);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   260
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
06bc494ca11e Initial load
duke
parents:
diff changeset
   262
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
 * Buffer Access
06bc494ca11e Initial load
duke
parents:
diff changeset
   264
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   265
06bc494ca11e Initial load
duke
parents:
diff changeset
   266
    /** Read a character.
06bc494ca11e Initial load
duke
parents:
diff changeset
   267
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
    char nextChar() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
        return (char)(((buf[bp++] & 0xFF) << 8) + (buf[bp++] & 0xFF));
06bc494ca11e Initial load
duke
parents:
diff changeset
   270
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   272
    /** Read a byte.
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   273
     */
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
   274
    int nextByte() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
   275
        return buf[bp++] & 0xFF;
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   276
    }
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   277
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   278
    /** Read an integer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   279
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   280
    int nextInt() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
            ((buf[bp++] & 0xFF) << 24) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   283
            ((buf[bp++] & 0xFF) << 16) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   284
            ((buf[bp++] & 0xFF) << 8) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   285
            (buf[bp++] & 0xFF);
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
    /** Extract a character at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   289
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   290
    char getChar(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   291
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
   292
            (char)(((buf[bp] & 0xFF) << 8) + (buf[bp+1] & 0xFF));
06bc494ca11e Initial load
duke
parents:
diff changeset
   293
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   294
06bc494ca11e Initial load
duke
parents:
diff changeset
   295
    /** Extract an integer at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   296
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   297
    int getInt(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   298
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
   299
            ((buf[bp] & 0xFF) << 24) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   300
            ((buf[bp+1] & 0xFF) << 16) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   301
            ((buf[bp+2] & 0xFF) << 8) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   302
            (buf[bp+3] & 0xFF);
06bc494ca11e Initial load
duke
parents:
diff changeset
   303
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   304
06bc494ca11e Initial load
duke
parents:
diff changeset
   305
06bc494ca11e Initial load
duke
parents:
diff changeset
   306
    /** Extract a long integer at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   307
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   308
    long getLong(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   309
        DataInputStream bufin =
06bc494ca11e Initial load
duke
parents:
diff changeset
   310
            new DataInputStream(new ByteArrayInputStream(buf, bp, 8));
06bc494ca11e Initial load
duke
parents:
diff changeset
   311
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   312
            return bufin.readLong();
06bc494ca11e Initial load
duke
parents:
diff changeset
   313
        } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   314
            throw new AssertionError(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   315
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   316
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   317
06bc494ca11e Initial load
duke
parents:
diff changeset
   318
    /** Extract a float at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   319
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   320
    float getFloat(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   321
        DataInputStream bufin =
06bc494ca11e Initial load
duke
parents:
diff changeset
   322
            new DataInputStream(new ByteArrayInputStream(buf, bp, 4));
06bc494ca11e Initial load
duke
parents:
diff changeset
   323
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   324
            return bufin.readFloat();
06bc494ca11e Initial load
duke
parents:
diff changeset
   325
        } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   326
            throw new AssertionError(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   327
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   328
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   329
06bc494ca11e Initial load
duke
parents:
diff changeset
   330
    /** Extract a double at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   331
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   332
    double getDouble(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   333
        DataInputStream bufin =
06bc494ca11e Initial load
duke
parents:
diff changeset
   334
            new DataInputStream(new ByteArrayInputStream(buf, bp, 8));
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
            return bufin.readDouble();
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
        } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   338
            throw new AssertionError(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   339
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   340
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   341
06bc494ca11e Initial load
duke
parents:
diff changeset
   342
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   343
 * Constant Pool Access
06bc494ca11e Initial load
duke
parents:
diff changeset
   344
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   345
06bc494ca11e Initial load
duke
parents:
diff changeset
   346
    /** Index all constant pool entries, writing their start addresses into
06bc494ca11e Initial load
duke
parents:
diff changeset
   347
     *  poolIdx.
06bc494ca11e Initial load
duke
parents:
diff changeset
   348
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   349
    void indexPool() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   350
        poolIdx = new int[nextChar()];
06bc494ca11e Initial load
duke
parents:
diff changeset
   351
        poolObj = new Object[poolIdx.length];
06bc494ca11e Initial load
duke
parents:
diff changeset
   352
        int i = 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
   353
        while (i < poolIdx.length) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   354
            poolIdx[i++] = bp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   355
            byte tag = buf[bp++];
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
            switch (tag) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
            case CONSTANT_Utf8: case CONSTANT_Unicode: {
06bc494ca11e Initial load
duke
parents:
diff changeset
   358
                int len = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
   359
                bp = bp + len;
06bc494ca11e Initial load
duke
parents:
diff changeset
   360
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   361
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   362
            case CONSTANT_Class:
06bc494ca11e Initial load
duke
parents:
diff changeset
   363
            case CONSTANT_String:
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   364
            case CONSTANT_MethodType:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
                bp = bp + 2;
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
                break;
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   367
            case CONSTANT_MethodHandle:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   368
                bp = bp + 3;
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   369
                break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
            case CONSTANT_Fieldref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   371
            case CONSTANT_Methodref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
            case CONSTANT_InterfaceMethodref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   373
            case CONSTANT_NameandType:
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
            case CONSTANT_Integer:
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
            case CONSTANT_Float:
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   376
            case CONSTANT_InvokeDynamic:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
                bp = bp + 4;
06bc494ca11e Initial load
duke
parents:
diff changeset
   378
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   379
            case CONSTANT_Long:
06bc494ca11e Initial load
duke
parents:
diff changeset
   380
            case CONSTANT_Double:
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
                bp = bp + 8;
06bc494ca11e Initial load
duke
parents:
diff changeset
   382
                i++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   383
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   384
            default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
                throw badClassFile("bad.const.pool.tag.at",
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
                                   Byte.toString(tag),
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
                                   Integer.toString(bp -1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   388
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   389
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   391
06bc494ca11e Initial load
duke
parents:
diff changeset
   392
    /** Read constant pool entry at start address i, use pool as a cache.
06bc494ca11e Initial load
duke
parents:
diff changeset
   393
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
    Object readPool(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   395
        Object result = poolObj[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
        if (result != null) return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
   397
06bc494ca11e Initial load
duke
parents:
diff changeset
   398
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   399
        if (index == 0) return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   400
06bc494ca11e Initial load
duke
parents:
diff changeset
   401
        byte tag = buf[index];
06bc494ca11e Initial load
duke
parents:
diff changeset
   402
        switch (tag) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   403
        case CONSTANT_Utf8:
06bc494ca11e Initial load
duke
parents:
diff changeset
   404
            poolObj[i] = names.fromUtf(buf, index + 3, getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   405
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   406
        case CONSTANT_Unicode:
06bc494ca11e Initial load
duke
parents:
diff changeset
   407
            throw badClassFile("unicode.str.not.supported");
06bc494ca11e Initial load
duke
parents:
diff changeset
   408
        case CONSTANT_Class:
06bc494ca11e Initial load
duke
parents:
diff changeset
   409
            poolObj[i] = readClassOrType(getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   410
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   411
        case CONSTANT_String:
06bc494ca11e Initial load
duke
parents:
diff changeset
   412
            // FIXME: (footprint) do not use toString here
06bc494ca11e Initial load
duke
parents:
diff changeset
   413
            poolObj[i] = readName(getChar(index + 1)).toString();
06bc494ca11e Initial load
duke
parents:
diff changeset
   414
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   415
        case CONSTANT_Fieldref: {
06bc494ca11e Initial load
duke
parents:
diff changeset
   416
            ClassSymbol owner = readClassSymbol(getChar(index + 1));
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   417
            NameAndType nt = readNameAndType(getChar(index + 3));
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
   418
            poolObj[i] = new VarSymbol(0, nt.name, nt.uniqueType.type, owner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   419
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   420
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   421
        case CONSTANT_Methodref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   422
        case CONSTANT_InterfaceMethodref: {
06bc494ca11e Initial load
duke
parents:
diff changeset
   423
            ClassSymbol owner = readClassSymbol(getChar(index + 1));
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   424
            NameAndType nt = readNameAndType(getChar(index + 3));
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
   425
            poolObj[i] = new MethodSymbol(0, nt.name, nt.uniqueType.type, owner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   426
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   427
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   428
        case CONSTANT_NameandType:
06bc494ca11e Initial load
duke
parents:
diff changeset
   429
            poolObj[i] = new NameAndType(
06bc494ca11e Initial load
duke
parents:
diff changeset
   430
                readName(getChar(index + 1)),
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
   431
                readType(getChar(index + 3)), types);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   432
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
        case CONSTANT_Integer:
06bc494ca11e Initial load
duke
parents:
diff changeset
   434
            poolObj[i] = getInt(index + 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   435
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   436
        case CONSTANT_Float:
06bc494ca11e Initial load
duke
parents:
diff changeset
   437
            poolObj[i] = new Float(getFloat(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   438
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   439
        case CONSTANT_Long:
06bc494ca11e Initial load
duke
parents:
diff changeset
   440
            poolObj[i] = new Long(getLong(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   441
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   442
        case CONSTANT_Double:
06bc494ca11e Initial load
duke
parents:
diff changeset
   443
            poolObj[i] = new Double(getDouble(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   444
            break;
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   445
        case CONSTANT_MethodHandle:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   446
            skipBytes(4);
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   447
            break;
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   448
        case CONSTANT_MethodType:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   449
            skipBytes(3);
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   450
            break;
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   451
        case CONSTANT_InvokeDynamic:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   452
            skipBytes(5);
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   453
            break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   454
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   455
            throw badClassFile("bad.const.pool.tag", Byte.toString(tag));
06bc494ca11e Initial load
duke
parents:
diff changeset
   456
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   457
        return poolObj[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   458
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   459
06bc494ca11e Initial load
duke
parents:
diff changeset
   460
    /** Read signature and convert to type.
06bc494ca11e Initial load
duke
parents:
diff changeset
   461
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   462
    Type readType(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   463
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   464
        return sigToType(buf, index + 3, getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   465
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   466
06bc494ca11e Initial load
duke
parents:
diff changeset
   467
    /** If name is an array type or class signature, return the
06bc494ca11e Initial load
duke
parents:
diff changeset
   468
     *  corresponding type; otherwise return a ClassSymbol with given name.
06bc494ca11e Initial load
duke
parents:
diff changeset
   469
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   470
    Object readClassOrType(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   471
        int index =  poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   472
        int len = getChar(index + 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   473
        int start = index + 3;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
   474
        Assert.check(buf[start] == '[' || buf[start + len - 1] != ';');
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   475
        // by the above assertion, the following test can be
06bc494ca11e Initial load
duke
parents:
diff changeset
   476
        // simplified to (buf[start] == '[')
06bc494ca11e Initial load
duke
parents:
diff changeset
   477
        return (buf[start] == '[' || buf[start + len - 1] == ';')
06bc494ca11e Initial load
duke
parents:
diff changeset
   478
            ? (Object)sigToType(buf, start, len)
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   479
            : (Object)syms.enterClass(names.fromUtf(internalize(buf, start,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   480
                                                           len)));
06bc494ca11e Initial load
duke
parents:
diff changeset
   481
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   482
06bc494ca11e Initial load
duke
parents:
diff changeset
   483
    /** Read signature and convert to type parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
   484
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   485
    List<Type> readTypeParams(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   486
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   487
        return sigToTypeParams(buf, index + 3, getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   488
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   489
06bc494ca11e Initial load
duke
parents:
diff changeset
   490
    /** Read class entry.
06bc494ca11e Initial load
duke
parents:
diff changeset
   491
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   492
    ClassSymbol readClassSymbol(int i) {
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   493
        Object obj = readPool(i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   494
        if (obj != null && !(obj instanceof ClassSymbol))
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   495
            throw badClassFile("bad.const.pool.entry",
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   496
                               currentClassFile.toString(),
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   497
                               "CONSTANT_Class_info", i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   498
        return (ClassSymbol)obj;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   499
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   500
06bc494ca11e Initial load
duke
parents:
diff changeset
   501
    /** Read name.
06bc494ca11e Initial load
duke
parents:
diff changeset
   502
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   503
    Name readName(int i) {
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   504
        Object obj = readPool(i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   505
        if (obj != null && !(obj instanceof Name))
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   506
            throw badClassFile("bad.const.pool.entry",
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   507
                               currentClassFile.toString(),
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   508
                               "CONSTANT_Utf8_info or CONSTANT_String_info", i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   509
        return (Name)obj;
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   510
    }
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   511
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   512
    /** Read name and type.
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   513
     */
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   514
    NameAndType readNameAndType(int i) {
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   515
        Object obj = readPool(i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   516
        if (obj != null && !(obj instanceof NameAndType))
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   517
            throw badClassFile("bad.const.pool.entry",
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   518
                               currentClassFile.toString(),
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   519
                               "CONSTANT_NameAndType_info", i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   520
        return (NameAndType)obj;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   522
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   524
 * Reading Types
06bc494ca11e Initial load
duke
parents:
diff changeset
   525
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   526
06bc494ca11e Initial load
duke
parents:
diff changeset
   527
    /** The unread portion of the currently read type is
06bc494ca11e Initial load
duke
parents:
diff changeset
   528
     *  signature[sigp..siglimit-1].
06bc494ca11e Initial load
duke
parents:
diff changeset
   529
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   530
    byte[] signature;
06bc494ca11e Initial load
duke
parents:
diff changeset
   531
    int sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   532
    int siglimit;
06bc494ca11e Initial load
duke
parents:
diff changeset
   533
    boolean sigEnterPhase = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   534
06bc494ca11e Initial load
duke
parents:
diff changeset
   535
    /** Convert signature to type, where signature is a byte array segment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   536
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   537
    Type sigToType(byte[] sig, int offset, int len) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   538
        signature = sig;
06bc494ca11e Initial load
duke
parents:
diff changeset
   539
        sigp = offset;
06bc494ca11e Initial load
duke
parents:
diff changeset
   540
        siglimit = offset + len;
06bc494ca11e Initial load
duke
parents:
diff changeset
   541
        return sigToType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   542
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   543
06bc494ca11e Initial load
duke
parents:
diff changeset
   544
    /** Convert signature to type, where signature is implicit.
06bc494ca11e Initial load
duke
parents:
diff changeset
   545
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   546
    Type sigToType() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   547
        switch ((char) signature[sigp]) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
        case 'T':
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
            int start = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   551
            while (signature[sigp] != ';') sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   552
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   553
            return sigEnterPhase
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
                ? Type.noType
06bc494ca11e Initial load
duke
parents:
diff changeset
   555
                : findTypeVar(names.fromUtf(signature, start, sigp - 1 - start));
06bc494ca11e Initial load
duke
parents:
diff changeset
   556
        case '+': {
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   558
            Type t = sigToType();
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   559
            return new WildcardType(t, BoundKind.EXTENDS, syms.boundClass,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   560
                                    Type.noAnnotations);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   561
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   562
        case '*':
06bc494ca11e Initial load
duke
parents:
diff changeset
   563
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   564
            return new WildcardType(syms.objectType, BoundKind.UNBOUND,
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   565
                                    syms.boundClass, Type.noAnnotations);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   566
        case '-': {
06bc494ca11e Initial load
duke
parents:
diff changeset
   567
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   568
            Type t = sigToType();
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   569
            return new WildcardType(t, BoundKind.SUPER, syms.boundClass,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   570
                                    Type.noAnnotations);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   571
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   572
        case 'B':
06bc494ca11e Initial load
duke
parents:
diff changeset
   573
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   574
            return syms.byteType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   575
        case 'C':
06bc494ca11e Initial load
duke
parents:
diff changeset
   576
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   577
            return syms.charType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   578
        case 'D':
06bc494ca11e Initial load
duke
parents:
diff changeset
   579
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   580
            return syms.doubleType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   581
        case 'F':
06bc494ca11e Initial load
duke
parents:
diff changeset
   582
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   583
            return syms.floatType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   584
        case 'I':
06bc494ca11e Initial load
duke
parents:
diff changeset
   585
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   586
            return syms.intType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   587
        case 'J':
06bc494ca11e Initial load
duke
parents:
diff changeset
   588
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   589
            return syms.longType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   590
        case 'L':
06bc494ca11e Initial load
duke
parents:
diff changeset
   591
            {
06bc494ca11e Initial load
duke
parents:
diff changeset
   592
                // int oldsigp = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   593
                Type t = classSigToType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   594
                if (sigp < siglimit && signature[sigp] == '.')
06bc494ca11e Initial load
duke
parents:
diff changeset
   595
                    throw badClassFile("deprecated inner class signature syntax " +
06bc494ca11e Initial load
duke
parents:
diff changeset
   596
                                       "(please recompile from source)");
06bc494ca11e Initial load
duke
parents:
diff changeset
   597
                /*
06bc494ca11e Initial load
duke
parents:
diff changeset
   598
                System.err.println(" decoded " +
06bc494ca11e Initial load
duke
parents:
diff changeset
   599
                                   new String(signature, oldsigp, sigp-oldsigp) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   600
                                   " => " + t + " outer " + t.outer());
06bc494ca11e Initial load
duke
parents:
diff changeset
   601
                */
06bc494ca11e Initial load
duke
parents:
diff changeset
   602
                return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   603
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   604
        case 'S':
06bc494ca11e Initial load
duke
parents:
diff changeset
   605
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   606
            return syms.shortType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   607
        case 'V':
06bc494ca11e Initial load
duke
parents:
diff changeset
   608
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   609
            return syms.voidType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   610
        case 'Z':
06bc494ca11e Initial load
duke
parents:
diff changeset
   611
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   612
            return syms.booleanType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   613
        case '[':
06bc494ca11e Initial load
duke
parents:
diff changeset
   614
            sigp++;
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   615
            return new ArrayType(sigToType(), syms.arrayClass,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   616
                                 Type.noAnnotations);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   617
        case '(':
06bc494ca11e Initial load
duke
parents:
diff changeset
   618
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   619
            List<Type> argtypes = sigToTypes(')');
06bc494ca11e Initial load
duke
parents:
diff changeset
   620
            Type restype = sigToType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   621
            List<Type> thrown = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
   622
            while (signature[sigp] == '^') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   623
                sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   624
                thrown = thrown.prepend(sigToType());
06bc494ca11e Initial load
duke
parents:
diff changeset
   625
            }
20242
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   626
            // if there is a typevar in the throws clause we should state it.
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   627
            for (List<Type> l = thrown; l.nonEmpty(); l = l.tail) {
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   628
                if (l.head.hasTag(TYPEVAR)) {
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   629
                    l.head.tsym.flags_field |= THROWS;
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   630
                }
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   631
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   632
            return new MethodType(argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   633
                                  restype,
06bc494ca11e Initial load
duke
parents:
diff changeset
   634
                                  thrown.reverse(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   635
                                  syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
   636
        case '<':
06bc494ca11e Initial load
duke
parents:
diff changeset
   637
            typevars = typevars.dup(currentOwner);
06bc494ca11e Initial load
duke
parents:
diff changeset
   638
            Type poly = new ForAll(sigToTypeParams(), sigToType());
06bc494ca11e Initial load
duke
parents:
diff changeset
   639
            typevars = typevars.leave();
06bc494ca11e Initial load
duke
parents:
diff changeset
   640
            return poly;
06bc494ca11e Initial load
duke
parents:
diff changeset
   641
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   642
            throw badClassFile("bad.signature",
06bc494ca11e Initial load
duke
parents:
diff changeset
   643
                               Convert.utf2string(signature, sigp, 10));
06bc494ca11e Initial load
duke
parents:
diff changeset
   644
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   645
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   646
06bc494ca11e Initial load
duke
parents:
diff changeset
   647
    byte[] signatureBuffer = new byte[0];
06bc494ca11e Initial load
duke
parents:
diff changeset
   648
    int sbp = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
   649
    /** Convert class signature to type, where signature is implicit.
06bc494ca11e Initial load
duke
parents:
diff changeset
   650
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   651
    Type classSigToType() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   652
        if (signature[sigp] != 'L')
06bc494ca11e Initial load
duke
parents:
diff changeset
   653
            throw badClassFile("bad.class.signature",
06bc494ca11e Initial load
duke
parents:
diff changeset
   654
                               Convert.utf2string(signature, sigp, 10));
06bc494ca11e Initial load
duke
parents:
diff changeset
   655
        sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   656
        Type outer = Type.noType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   657
        int startSbp = sbp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   658
06bc494ca11e Initial load
duke
parents:
diff changeset
   659
        while (true) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   660
            final byte c = signature[sigp++];
06bc494ca11e Initial load
duke
parents:
diff changeset
   661
            switch (c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   662
06bc494ca11e Initial load
duke
parents:
diff changeset
   663
            case ';': {         // end
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   664
                ClassSymbol t = syms.enterClass(names.fromUtf(signatureBuffer,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   665
                                                         startSbp,
06bc494ca11e Initial load
duke
parents:
diff changeset
   666
                                                         sbp - startSbp));
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   667
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   668
                try {
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   669
                    return (outer == Type.noType) ?
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   670
                            t.erasure(types) :
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   671
                        new ClassType(outer, List.<Type>nil(), t,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   672
                                      Type.noAnnotations);
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   673
                } finally {
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   674
                    sbp = startSbp;
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   675
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   676
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   677
06bc494ca11e Initial load
duke
parents:
diff changeset
   678
            case '<':           // generic arguments
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   679
                ClassSymbol t = syms.enterClass(names.fromUtf(signatureBuffer,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   680
                                                         startSbp,
06bc494ca11e Initial load
duke
parents:
diff changeset
   681
                                                         sbp - startSbp));
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   682
                outer = new ClassType(outer, sigToTypes('>'), t,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   683
                                      Type.noAnnotations) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   684
                        boolean completed = false;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   685
                        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   686
                        public Type getEnclosingType() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   687
                            if (!completed) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   688
                                completed = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   689
                                tsym.complete();
06bc494ca11e Initial load
duke
parents:
diff changeset
   690
                                Type enclosingType = tsym.type.getEnclosingType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   691
                                if (enclosingType != Type.noType) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   692
                                    List<Type> typeArgs =
06bc494ca11e Initial load
duke
parents:
diff changeset
   693
                                        super.getEnclosingType().allparams();
06bc494ca11e Initial load
duke
parents:
diff changeset
   694
                                    List<Type> typeParams =
06bc494ca11e Initial load
duke
parents:
diff changeset
   695
                                        enclosingType.allparams();
06bc494ca11e Initial load
duke
parents:
diff changeset
   696
                                    if (typeParams.length() != typeArgs.length()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   697
                                        // no "rare" types
06bc494ca11e Initial load
duke
parents:
diff changeset
   698
                                        super.setEnclosingType(types.erasure(enclosingType));
06bc494ca11e Initial load
duke
parents:
diff changeset
   699
                                    } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   700
                                        super.setEnclosingType(types.subst(enclosingType,
06bc494ca11e Initial load
duke
parents:
diff changeset
   701
                                                                           typeParams,
06bc494ca11e Initial load
duke
parents:
diff changeset
   702
                                                                           typeArgs));
06bc494ca11e Initial load
duke
parents:
diff changeset
   703
                                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   704
                                } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   705
                                    super.setEnclosingType(Type.noType);
06bc494ca11e Initial load
duke
parents:
diff changeset
   706
                                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   707
                            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   708
                            return super.getEnclosingType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   709
                        }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   710
                        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   711
                        public void setEnclosingType(Type outer) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   712
                            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
   713
                        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   714
                    };
06bc494ca11e Initial load
duke
parents:
diff changeset
   715
                switch (signature[sigp++]) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   716
                case ';':
06bc494ca11e Initial load
duke
parents:
diff changeset
   717
                    if (sigp < signature.length && signature[sigp] == '.') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   718
                        // support old-style GJC signatures
06bc494ca11e Initial load
duke
parents:
diff changeset
   719
                        // The signature produced was
06bc494ca11e Initial load
duke
parents:
diff changeset
   720
                        // Lfoo/Outer<Lfoo/X;>;.Lfoo/Outer$Inner<Lfoo/Y;>;
06bc494ca11e Initial load
duke
parents:
diff changeset
   721
                        // rather than say
06bc494ca11e Initial load
duke
parents:
diff changeset
   722
                        // Lfoo/Outer<Lfoo/X;>.Inner<Lfoo/Y;>;
06bc494ca11e Initial load
duke
parents:
diff changeset
   723
                        // so we skip past ".Lfoo/Outer$"
06bc494ca11e Initial load
duke
parents:
diff changeset
   724
                        sigp += (sbp - startSbp) + // "foo/Outer"
06bc494ca11e Initial load
duke
parents:
diff changeset
   725
                            3;  // ".L" and "$"
06bc494ca11e Initial load
duke
parents:
diff changeset
   726
                        signatureBuffer[sbp++] = (byte)'$';
06bc494ca11e Initial load
duke
parents:
diff changeset
   727
                        break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   728
                    } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   729
                        sbp = startSbp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   730
                        return outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
   731
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   732
                case '.':
06bc494ca11e Initial load
duke
parents:
diff changeset
   733
                    signatureBuffer[sbp++] = (byte)'$';
06bc494ca11e Initial load
duke
parents:
diff changeset
   734
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   735
                default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   736
                    throw new AssertionError(signature[sigp-1]);
06bc494ca11e Initial load
duke
parents:
diff changeset
   737
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   738
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   739
06bc494ca11e Initial load
duke
parents:
diff changeset
   740
            case '.':
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   741
                //we have seen an enclosing non-generic class
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   742
                if (outer != Type.noType) {
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   743
                    t = syms.enterClass(names.fromUtf(signatureBuffer,
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   744
                                                 startSbp,
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   745
                                                 sbp - startSbp));
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   746
                    outer = new ClassType(outer, List.<Type>nil(), t,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   747
                                          Type.noAnnotations);
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   748
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   749
                signatureBuffer[sbp++] = (byte)'$';
06bc494ca11e Initial load
duke
parents:
diff changeset
   750
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   751
            case '/':
06bc494ca11e Initial load
duke
parents:
diff changeset
   752
                signatureBuffer[sbp++] = (byte)'.';
06bc494ca11e Initial load
duke
parents:
diff changeset
   753
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   754
            default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   755
                signatureBuffer[sbp++] = c;
06bc494ca11e Initial load
duke
parents:
diff changeset
   756
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   757
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   758
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   759
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   760
06bc494ca11e Initial load
duke
parents:
diff changeset
   761
    /** Convert (implicit) signature to list of types
06bc494ca11e Initial load
duke
parents:
diff changeset
   762
     *  until `terminator' is encountered.
06bc494ca11e Initial load
duke
parents:
diff changeset
   763
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   764
    List<Type> sigToTypes(char terminator) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   765
        List<Type> head = List.of(null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   766
        List<Type> tail = head;
06bc494ca11e Initial load
duke
parents:
diff changeset
   767
        while (signature[sigp] != terminator)
06bc494ca11e Initial load
duke
parents:
diff changeset
   768
            tail = tail.setTail(List.of(sigToType()));
06bc494ca11e Initial load
duke
parents:
diff changeset
   769
        sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   770
        return head.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   771
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   772
06bc494ca11e Initial load
duke
parents:
diff changeset
   773
    /** Convert signature to type parameters, where signature is a byte
06bc494ca11e Initial load
duke
parents:
diff changeset
   774
     *  array segment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   775
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   776
    List<Type> sigToTypeParams(byte[] sig, int offset, int len) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   777
        signature = sig;
06bc494ca11e Initial load
duke
parents:
diff changeset
   778
        sigp = offset;
06bc494ca11e Initial load
duke
parents:
diff changeset
   779
        siglimit = offset + len;
06bc494ca11e Initial load
duke
parents:
diff changeset
   780
        return sigToTypeParams();
06bc494ca11e Initial load
duke
parents:
diff changeset
   781
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   782
06bc494ca11e Initial load
duke
parents:
diff changeset
   783
    /** Convert signature to type parameters, where signature is implicit.
06bc494ca11e Initial load
duke
parents:
diff changeset
   784
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   785
    List<Type> sigToTypeParams() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   786
        List<Type> tvars = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
   787
        if (signature[sigp] == '<') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   788
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   789
            int start = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   790
            sigEnterPhase = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   791
            while (signature[sigp] != '>')
06bc494ca11e Initial load
duke
parents:
diff changeset
   792
                tvars = tvars.prepend(sigToTypeParam());
06bc494ca11e Initial load
duke
parents:
diff changeset
   793
            sigEnterPhase = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   794
            sigp = start;
06bc494ca11e Initial load
duke
parents:
diff changeset
   795
            while (signature[sigp] != '>')
06bc494ca11e Initial load
duke
parents:
diff changeset
   796
                sigToTypeParam();
06bc494ca11e Initial load
duke
parents:
diff changeset
   797
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   798
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   799
        return tvars.reverse();
06bc494ca11e Initial load
duke
parents:
diff changeset
   800
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   801
06bc494ca11e Initial load
duke
parents:
diff changeset
   802
    /** Convert (implicit) signature to type parameter.
06bc494ca11e Initial load
duke
parents:
diff changeset
   803
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   804
    Type sigToTypeParam() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   805
        int start = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   806
        while (signature[sigp] != ':') sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   807
        Name name = names.fromUtf(signature, start, sigp - start);
06bc494ca11e Initial load
duke
parents:
diff changeset
   808
        TypeVar tvar;
06bc494ca11e Initial load
duke
parents:
diff changeset
   809
        if (sigEnterPhase) {
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   810
            tvar = new TypeVar(name, currentOwner, syms.botType,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   811
                               Type.noAnnotations);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   812
            typevars.enter(tvar.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   813
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   814
            tvar = (TypeVar)findTypeVar(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   815
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   816
        List<Type> bounds = List.nil();
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14547
diff changeset
   817
        boolean allInterfaces = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   818
        if (signature[sigp] == ':' && signature[sigp+1] == ':') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   819
            sigp++;
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14547
diff changeset
   820
            allInterfaces = true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   821
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   822
        while (signature[sigp] == ':') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   823
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   824
            bounds = bounds.prepend(sigToType());
06bc494ca11e Initial load
duke
parents:
diff changeset
   825
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   826
        if (!sigEnterPhase) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14547
diff changeset
   827
            types.setBounds(tvar, bounds.reverse(), allInterfaces);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   828
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   829
        return tvar;
06bc494ca11e Initial load
duke
parents:
diff changeset
   830
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   831
06bc494ca11e Initial load
duke
parents:
diff changeset
   832
    /** Find type variable with given name in `typevars' scope.
06bc494ca11e Initial load
duke
parents:
diff changeset
   833
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   834
    Type findTypeVar(Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   835
        Scope.Entry e = typevars.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   836
        if (e.scope != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   837
            return e.sym.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
   838
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   839
            if (readingClassAttr) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   840
                // While reading the class attribute, the supertypes
06bc494ca11e Initial load
duke
parents:
diff changeset
   841
                // might refer to a type variable from an enclosing element
06bc494ca11e Initial load
duke
parents:
diff changeset
   842
                // (method or class).
06bc494ca11e Initial load
duke
parents:
diff changeset
   843
                // If the type variable is defined in the enclosing class,
06bc494ca11e Initial load
duke
parents:
diff changeset
   844
                // we can actually find it in
06bc494ca11e Initial load
duke
parents:
diff changeset
   845
                // currentOwner.owner.type.getTypeArguments()
06bc494ca11e Initial load
duke
parents:
diff changeset
   846
                // However, until we have read the enclosing method attribute
06bc494ca11e Initial load
duke
parents:
diff changeset
   847
                // we don't know for sure if this owner is correct.  It could
06bc494ca11e Initial load
duke
parents:
diff changeset
   848
                // be a method and there is no way to tell before reading the
06bc494ca11e Initial load
duke
parents:
diff changeset
   849
                // enclosing method attribute.
24396
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   850
                TypeVar t = new TypeVar(name, currentOwner, syms.botType,
3c36c6afcbca 8040327: Eliminate AnnotatedType
emc
parents: 24298
diff changeset
   851
                                        Type.noAnnotations);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   852
                missingTypeVariables = missingTypeVariables.prepend(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
   853
                // System.err.println("Missing type var " + name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   854
                return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   855
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   856
            throw badClassFile("undecl.type.var", name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   857
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   858
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   859
06bc494ca11e Initial load
duke
parents:
diff changeset
   860
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   861
 * Reading Attributes
06bc494ca11e Initial load
duke
parents:
diff changeset
   862
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   863
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
   864
    protected enum AttributeKind { CLASS, MEMBER }
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
   865
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   866
    protected abstract class AttributeReader {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   867
        protected AttributeReader(Name name, ClassFile.Version version, Set<AttributeKind> kinds) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   868
            this.name = name;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   869
            this.version = version;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   870
            this.kinds = kinds;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   871
        }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   872
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   873
        protected boolean accepts(AttributeKind kind) {
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   874
            if (kinds.contains(kind)) {
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   875
                if (majorVersion > version.major || (majorVersion == version.major && minorVersion >= version.minor))
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   876
                    return true;
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   877
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   878
                if (lintClassfile && !warnedAttrs.contains(name)) {
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   879
                    JavaFileObject prev = log.useSource(currentClassFile);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   880
                    try {
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   881
                        log.warning(LintCategory.CLASSFILE, (DiagnosticPosition) null, "future.attr",
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   882
                                name, version.major, version.minor, majorVersion, minorVersion);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   883
                    } finally {
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   884
                        log.useSource(prev);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   885
                    }
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   886
                    warnedAttrs.add(name);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   887
                }
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   888
            }
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   889
            return false;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   890
        }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   891
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   892
        protected abstract void read(Symbol sym, int attrLen);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   893
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   894
        protected final Name name;
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   895
        protected final ClassFile.Version version;
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   896
        protected final Set<AttributeKind> kinds;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   897
    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   898
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   899
    protected Set<AttributeKind> CLASS_ATTRIBUTE =
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   900
            EnumSet.of(AttributeKind.CLASS);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   901
    protected Set<AttributeKind> MEMBER_ATTRIBUTE =
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   902
            EnumSet.of(AttributeKind.MEMBER);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   903
    protected Set<AttributeKind> CLASS_OR_MEMBER_ATTRIBUTE =
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   904
            EnumSet.of(AttributeKind.CLASS, AttributeKind.MEMBER);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   905
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
   906
    protected Map<Name, AttributeReader> attributeReaders = new HashMap<>();
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   907
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   908
    private void initAttributeReaders() {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   909
        AttributeReader[] readers = {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   910
            // v45.3 attributes
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   911
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   912
            new AttributeReader(names.Code, V45_3, MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   913
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   914
                    if (readAllOfClassFile || saveParameterNames)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   915
                        ((MethodSymbol)sym).code = readCode(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   916
                    else
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   917
                        bp = bp + attrLen;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   918
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   919
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   920
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   921
            new AttributeReader(names.ConstantValue, V45_3, MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   922
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   923
                    Object v = readPool(nextChar());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   924
                    // Ignore ConstantValue attribute if field not final.
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   925
                    if ((sym.flags() & FINAL) != 0)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   926
                        ((VarSymbol) sym).setData(v);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   927
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   928
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   929
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   930
            new AttributeReader(names.Deprecated, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   931
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   932
                    sym.flags_field |= DEPRECATED;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   933
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   934
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   935
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   936
            new AttributeReader(names.Exceptions, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   937
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   938
                    int nexceptions = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   939
                    List<Type> thrown = List.nil();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   940
                    for (int j = 0; j < nexceptions; j++)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   941
                        thrown = thrown.prepend(readClassSymbol(nextChar()).type);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   942
                    if (sym.type.getThrownTypes().isEmpty())
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   943
                        sym.type.asMethodType().thrown = thrown.reverse();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   944
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   945
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   946
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   947
            new AttributeReader(names.InnerClasses, V45_3, CLASS_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   948
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   949
                    ClassSymbol c = (ClassSymbol) sym;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   950
                    readInnerClasses(c);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   951
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   952
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   953
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   954
            new AttributeReader(names.LocalVariableTable, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   955
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   956
                    int newbp = bp + attrLen;
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   957
                    if (saveParameterNames && !sawMethodParameters) {
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   958
                        // Pick up parameter names from the variable table.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   959
                        // Parameter names are not explicitly identified as such,
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   960
                        // but all parameter name entries in the LocalVariableTable
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   961
                        // have a start_pc of 0.  Therefore, we record the name
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   962
                        // indicies of all slots with a start_pc of zero in the
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   963
                        // parameterNameIndicies array.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   964
                        // Note that this implicitly honors the JVMS spec that
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   965
                        // there may be more than one LocalVariableTable, and that
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   966
                        // there is no specified ordering for the entries.
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   967
                        int numEntries = nextChar();
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   968
                        for (int i = 0; i < numEntries; i++) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   969
                            int start_pc = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   970
                            int length = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   971
                            int nameIndex = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   972
                            int sigIndex = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   973
                            int register = nextChar();
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   974
                            if (start_pc == 0) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   975
                                // ensure array large enough
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   976
                                if (register >= parameterNameIndices.length) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   977
                                    int newSize = Math.max(register, parameterNameIndices.length + 8);
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   978
                                    parameterNameIndices =
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   979
                                            Arrays.copyOf(parameterNameIndices, newSize);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   980
                                }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   981
                                parameterNameIndices[register] = nameIndex;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   982
                                haveParameterNameIndices = true;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   983
                            }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   984
                        }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   985
                    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   986
                    bp = newbp;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   987
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   988
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   989
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   990
            new AttributeReader(names.MethodParameters, V52, MEMBER_ATTRIBUTE) {
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   991
                protected void read(Symbol sym, int attrlen) {
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   992
                    int newbp = bp + attrlen;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   993
                    if (saveParameterNames) {
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   994
                        sawMethodParameters = true;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   995
                        int numEntries = nextByte();
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   996
                        parameterNameIndices = new int[numEntries];
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   997
                        haveParameterNameIndices = true;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   998
                        for (int i = 0; i < numEntries; i++) {
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   999
                            int nameIndex = nextChar();
16305
ee7f13d9d434 8006948: Update javac for MethodParameters format change
ksrini
parents: 16300
diff changeset
  1000
                            int flags = nextChar();
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1001
                            parameterNameIndices[i] = nameIndex;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1002
                        }
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1003
                    }
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1004
                    bp = newbp;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1005
                }
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1006
            },
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1007
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1008
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1009
            new AttributeReader(names.SourceFile, V45_3, CLASS_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1010
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1011
                    ClassSymbol c = (ClassSymbol) sym;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1012
                    Name n = readName(nextChar());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1013
                    c.sourcefile = new SourceFileObject(n, c.flatname);
14369
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1014
                    // If the class is a toplevel class, originating from a Java source file,
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1015
                    // but the class name does not match the file name, then it is
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1016
                    // an auxiliary class.
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1017
                    String sn = n.toString();
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1018
                    if (c.owner.kind == Kinds.PCK &&
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1019
                        sn.endsWith(".java") &&
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1020
                        !sn.equals(c.name.toString()+".java")) {
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1021
                        c.flags_field |= AUXILIARY;
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1022
                    }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1023
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1024
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1025
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1026
            new AttributeReader(names.Synthetic, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1027
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1028
                    // bridge methods are visible when generics not enabled
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1029
                    if (allowGenerics || (sym.flags_field & BRIDGE) == 0)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1030
                        sym.flags_field |= SYNTHETIC;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1031
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1032
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1033
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1034
            // standard v49 attributes
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1035
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1036
            new AttributeReader(names.EnclosingMethod, V49, CLASS_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1037
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1038
                    int newbp = bp + attrLen;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1039
                    readEnclosingMethodAttr(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1040
                    bp = newbp;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1041
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1042
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1043
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1044
            new AttributeReader(names.Signature, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1045
                @Override
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1046
                protected boolean accepts(AttributeKind kind) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1047
                    return super.accepts(kind) && allowGenerics;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1048
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1049
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1050
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1051
                    if (sym.kind == TYP) {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1052
                        ClassSymbol c = (ClassSymbol) sym;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1053
                        readingClassAttr = true;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1054
                        try {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1055
                            ClassType ct1 = (ClassType)c.type;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1056
                            Assert.check(c == currentOwner);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1057
                            ct1.typarams_field = readTypeParams(nextChar());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1058
                            ct1.supertype_field = sigToType();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1059
                            ListBuffer<Type> is = new ListBuffer<>();
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1060
                            while (sigp != siglimit) is.append(sigToType());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1061
                            ct1.interfaces_field = is.toList();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1062
                        } finally {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1063
                            readingClassAttr = false;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1064
                        }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1065
                    } else {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1066
                        List<Type> thrown = sym.type.getThrownTypes();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1067
                        sym.type = readType(nextChar());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1068
                        //- System.err.println(" # " + sym.type);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1069
                        if (sym.kind == MTH && sym.type.getThrownTypes().isEmpty())
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1070
                            sym.type.asMethodType().thrown = thrown;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1071
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1072
                    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1073
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1074
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1075
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1076
            // v49 annotation attributes
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1077
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1078
            new AttributeReader(names.AnnotationDefault, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1079
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1080
                    attachAnnotationDefault(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1081
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1082
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1083
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1084
            new AttributeReader(names.RuntimeInvisibleAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1085
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1086
                    attachAnnotations(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1087
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1088
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1089
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1090
            new AttributeReader(names.RuntimeInvisibleParameterAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1091
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1092
                    attachParameterAnnotations(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1093
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1094
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1095
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1096
            new AttributeReader(names.RuntimeVisibleAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1097
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1098
                    attachAnnotations(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1099
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1100
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1101
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1102
            new AttributeReader(names.RuntimeVisibleParameterAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1103
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1104
                    attachParameterAnnotations(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1105
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1106
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1107
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1108
            // additional "legacy" v49 attributes, superceded by flags
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1109
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1110
            new AttributeReader(names.Annotation, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1111
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1112
                    if (allowAnnotations)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1113
                        sym.flags_field |= ANNOTATION;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1114
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1115
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1116
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1117
            new AttributeReader(names.Bridge, V49, MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1118
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1119
                    sym.flags_field |= BRIDGE;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1120
                    if (!allowGenerics)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1121
                        sym.flags_field &= ~SYNTHETIC;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1122
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1123
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1124
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1125
            new AttributeReader(names.Enum, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1126
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1127
                    sym.flags_field |= ENUM;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1128
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1129
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1130
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1131
            new AttributeReader(names.Varargs, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1132
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1133
                    if (allowVarargs)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1134
                        sym.flags_field |= VARARGS;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1135
                }
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1136
            },
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1137
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1138
            new AttributeReader(names.RuntimeVisibleTypeAnnotations, V52, CLASS_OR_MEMBER_ATTRIBUTE) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1139
                protected void read(Symbol sym, int attrLen) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1140
                    attachTypeAnnotations(sym);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1141
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1142
            },
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1143
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1144
            new AttributeReader(names.RuntimeInvisibleTypeAnnotations, V52, CLASS_OR_MEMBER_ATTRIBUTE) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1145
                protected void read(Symbol sym, int attrLen) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1146
                    attachTypeAnnotations(sym);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1147
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1148
            },
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1149
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1150
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1151
            // The following attributes for a Code attribute are not currently handled
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1152
            // StackMapTable
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1153
            // SourceDebugExtension
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1154
            // LineNumberTable
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1155
            // LocalVariableTypeTable
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1156
        };
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1157
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1158
        for (AttributeReader r: readers)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1159
            attributeReaders.put(r.name, r);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1160
    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1161
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1162
    /** Report unrecognized attribute.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1163
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1164
    void unrecognized(Name attrName) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1165
        if (checkClassFile)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1166
            printCCF("ccf.unrecognized.attribute", attrName);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1167
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1168
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1169
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1170
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1171
    protected void readEnclosingMethodAttr(Symbol sym) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1172
        // sym is a nested class with an "Enclosing Method" attribute
06bc494ca11e Initial load
duke
parents:
diff changeset
  1173
        // remove sym from it's current owners scope and place it in
06bc494ca11e Initial load
duke
parents:
diff changeset
  1174
        // the scope specified by the attribute
06bc494ca11e Initial load
duke
parents:
diff changeset
  1175
        sym.owner.members().remove(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1176
        ClassSymbol self = (ClassSymbol)sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1177
        ClassSymbol c = readClassSymbol(nextChar());
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
  1178
        NameAndType nt = readNameAndType(nextChar());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1179
9077
6ee59e40b258 7031108: NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build
jjg
parents: 8630
diff changeset
  1180
        if (c.members_field == null)
6ee59e40b258 7031108: NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build
jjg
parents: 8630
diff changeset
  1181
            throw badClassFile("bad.enclosing.class", self, c);
6ee59e40b258 7031108: NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build
jjg
parents: 8630
diff changeset
  1182
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1183
        MethodSymbol m = findMethod(nt, c.members_field, self.flags());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1184
        if (nt != null && m == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1185
            throw badClassFile("bad.enclosing.method", self);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1186
06bc494ca11e Initial load
duke
parents:
diff changeset
  1187
        self.name = simpleBinaryName(self.flatname, c.flatname) ;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1188
        self.owner = m != null ? m : c;
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 939
diff changeset
  1189
        if (self.name.isEmpty())
5012
405341b6e9c5 6449781: TypeElement.getQualifiedName for anonymous classes returns null instead of an empty name
darcy
parents: 4872
diff changeset
  1190
            self.fullname = names.empty;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1191
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1192
            self.fullname = ClassSymbol.formFullName(self.name, self.owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1193
06bc494ca11e Initial load
duke
parents:
diff changeset
  1194
        if (m != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1195
            ((ClassType)sym.type).setEnclosingType(m.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1196
        } else if ((self.flags_field & STATIC) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1197
            ((ClassType)sym.type).setEnclosingType(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1198
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1199
            ((ClassType)sym.type).setEnclosingType(Type.noType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1200
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1201
        enterTypevars(self);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1202
        if (!missingTypeVariables.isEmpty()) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1203
            ListBuffer<Type> typeVars =  new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1204
            for (Type typevar : missingTypeVariables) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1205
                typeVars.append(findTypeVar(typevar.tsym.name));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1206
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1207
            foundTypeVariables = typeVars.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1208
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1209
            foundTypeVariables = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1210
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1211
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1212
06bc494ca11e Initial load
duke
parents:
diff changeset
  1213
    // See java.lang.Class
06bc494ca11e Initial load
duke
parents:
diff changeset
  1214
    private Name simpleBinaryName(Name self, Name enclosing) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1215
        String simpleBinaryName = self.toString().substring(enclosing.toString().length());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1216
        if (simpleBinaryName.length() < 1 || simpleBinaryName.charAt(0) != '$')
06bc494ca11e Initial load
duke
parents:
diff changeset
  1217
            throw badClassFile("bad.enclosing.method", self);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1218
        int index = 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1219
        while (index < simpleBinaryName.length() &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1220
               isAsciiDigit(simpleBinaryName.charAt(index)))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1221
            index++;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1222
        return names.fromString(simpleBinaryName.substring(index));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1223
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1224
06bc494ca11e Initial load
duke
parents:
diff changeset
  1225
    private MethodSymbol findMethod(NameAndType nt, Scope scope, long flags) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1226
        if (nt == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1227
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1228
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1229
        MethodType type = nt.uniqueType.type.asMethodType();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1230
06bc494ca11e Initial load
duke
parents:
diff changeset
  1231
        for (Scope.Entry e = scope.lookup(nt.name); e.scope != null; e = e.next())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1232
            if (e.sym.kind == MTH && isSameBinaryType(e.sym.type.asMethodType(), type))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1233
                return (MethodSymbol)e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1234
06bc494ca11e Initial load
duke
parents:
diff changeset
  1235
        if (nt.name != names.init)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1236
            // not a constructor
06bc494ca11e Initial load
duke
parents:
diff changeset
  1237
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1238
        if ((flags & INTERFACE) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1239
            // no enclosing instance
06bc494ca11e Initial load
duke
parents:
diff changeset
  1240
            return null;
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1241
        if (nt.uniqueType.type.getParameterTypes().isEmpty())
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1242
            // no parameters
06bc494ca11e Initial load
duke
parents:
diff changeset
  1243
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1244
06bc494ca11e Initial load
duke
parents:
diff changeset
  1245
        // A constructor of an inner class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1246
        // Remove the first argument (the enclosing instance)
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1247
        nt.setType(new MethodType(nt.uniqueType.type.getParameterTypes().tail,
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1248
                                 nt.uniqueType.type.getReturnType(),
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1249
                                 nt.uniqueType.type.getThrownTypes(),
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1250
                                 syms.methodClass));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1251
        // Try searching again
06bc494ca11e Initial load
duke
parents:
diff changeset
  1252
        return findMethod(nt, scope, flags);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1253
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1254
06bc494ca11e Initial load
duke
parents:
diff changeset
  1255
    /** Similar to Types.isSameType but avoids completion */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1256
    private boolean isSameBinaryType(MethodType mt1, MethodType mt2) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1257
        List<Type> types1 = types.erasure(mt1.getParameterTypes())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1258
            .prepend(types.erasure(mt1.getReturnType()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1259
        List<Type> types2 = mt2.getParameterTypes().prepend(mt2.getReturnType());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1260
        while (!types1.isEmpty() && !types2.isEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1261
            if (types1.head.tsym != types2.head.tsym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1262
                return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1263
            types1 = types1.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1264
            types2 = types2.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1265
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1266
        return types1.isEmpty() && types2.isEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1267
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1268
06bc494ca11e Initial load
duke
parents:
diff changeset
  1269
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  1270
     * Character.isDigit answers <tt>true</tt> to some non-ascii
06bc494ca11e Initial load
duke
parents:
diff changeset
  1271
     * digits.  This one does not.  <b>copied from java.lang.Class</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
  1272
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1273
    private static boolean isAsciiDigit(char c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1274
        return '0' <= c && c <= '9';
06bc494ca11e Initial load
duke
parents:
diff changeset
  1275
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1276
06bc494ca11e Initial load
duke
parents:
diff changeset
  1277
    /** Read member attributes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1278
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1279
    void readMemberAttrs(Symbol sym) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1280
        readAttrs(sym, AttributeKind.MEMBER);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1281
    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1282
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1283
    void readAttrs(Symbol sym, AttributeKind kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1284
        char ac = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1285
        for (int i = 0; i < ac; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1286
            Name attrName = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1287
            int attrLen = nextInt();
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1288
            AttributeReader r = attributeReaders.get(attrName);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1289
            if (r != null && r.accepts(kind))
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1290
                r.read(sym, attrLen);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1291
            else  {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1292
                unrecognized(attrName);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1293
                bp = bp + attrLen;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1294
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1295
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1296
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1297
06bc494ca11e Initial load
duke
parents:
diff changeset
  1298
    private boolean readingClassAttr = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1299
    private List<Type> missingTypeVariables = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1300
    private List<Type> foundTypeVariables = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1301
06bc494ca11e Initial load
duke
parents:
diff changeset
  1302
    /** Read class attributes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1303
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1304
    void readClassAttrs(ClassSymbol c) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1305
        readAttrs(c, AttributeKind.CLASS);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1306
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1307
06bc494ca11e Initial load
duke
parents:
diff changeset
  1308
    /** Read code block.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1309
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1310
    Code readCode(Symbol owner) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1311
        nextChar(); // max_stack
06bc494ca11e Initial load
duke
parents:
diff changeset
  1312
        nextChar(); // max_locals
06bc494ca11e Initial load
duke
parents:
diff changeset
  1313
        final int  code_length = nextInt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1314
        bp += code_length;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1315
        final char exception_table_length = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1316
        bp += exception_table_length * 8;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1317
        readMemberAttrs(owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1318
        return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1319
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1320
06bc494ca11e Initial load
duke
parents:
diff changeset
  1321
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1322
 * Reading Java-language annotations
06bc494ca11e Initial load
duke
parents:
diff changeset
  1323
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1324
06bc494ca11e Initial load
duke
parents:
diff changeset
  1325
    /** Attach annotations.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1326
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1327
    void attachAnnotations(final Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1328
        int numAttributes = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1329
        if (numAttributes != 0) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1330
            ListBuffer<CompoundAnnotationProxy> proxies = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1331
            for (int i = 0; i<numAttributes; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1332
                CompoundAnnotationProxy proxy = readCompoundAnnotation();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1333
                if (proxy.type.tsym == syms.proprietaryType.tsym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1334
                    sym.flags_field |= PROPRIETARY;
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1335
                else if (proxy.type.tsym == syms.profileType.tsym) {
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1336
                    if (profile != Profile.DEFAULT) {
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1337
                        for (Pair<Name,Attribute> v: proxy.values) {
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1338
                            if (v.fst == names.value && v.snd instanceof Attribute.Constant) {
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1339
                                Attribute.Constant c = (Attribute.Constant) v.snd;
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1340
                                if (c.type == syms.intType && ((Integer) c.value) > profile.value) {
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1341
                                    sym.flags_field |= NOT_IN_PROFILE;
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1342
                                }
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1343
                            }
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1344
                        }
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1345
                    }
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
  1346
                } else
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1347
                    proxies.append(proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1348
            }
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13635
diff changeset
  1349
            annotate.normal(new AnnotationCompleter(sym, proxies.toList()));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1350
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1351
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1352
06bc494ca11e Initial load
duke
parents:
diff changeset
  1353
    /** Attach parameter annotations.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1354
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1355
    void attachParameterAnnotations(final Symbol method) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1356
        final MethodSymbol meth = (MethodSymbol)method;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1357
        int numParameters = buf[bp++] & 0xFF;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1358
        List<VarSymbol> parameters = meth.params();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1359
        int pnum = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1360
        while (parameters.tail != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1361
            attachAnnotations(parameters.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1362
            parameters = parameters.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1363
            pnum++;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1364
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1365
        if (pnum != numParameters) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1366
            throw badClassFile("bad.runtime.invisible.param.annotations", meth);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1367
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1368
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1369
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1370
    void attachTypeAnnotations(final Symbol sym) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1371
        int numAttributes = nextChar();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1372
        if (numAttributes != 0) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20242
diff changeset
  1373
            ListBuffer<TypeAnnotationProxy> proxies = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1374
            for (int i = 0; i < numAttributes; i++)
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1375
                proxies.append(readTypeAnnotation());
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1376
            annotate.normal(new TypeAnnotationCompleter(sym, proxies.toList()));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1377
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1378
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1379
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1380
    /** Attach the default value for an annotation element.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1381
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1382
    void attachAnnotationDefault(final Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1383
        final MethodSymbol meth = (MethodSymbol)sym; // only on methods
06bc494ca11e Initial load
duke
parents:
diff changeset
  1384
        final Attribute value = readAttributeValue();
14804
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1385
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1386
        // The default value is set later during annotation. It might
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1387
        // be the case that the Symbol sym is annotated _after_ the
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1388
        // repeating instances that depend on this default value,
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1389
        // because of this we set an interim value that tells us this
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1390
        // element (most likely) has a default.
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1391
        //
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1392
        // Set interim value for now, reset just before we do this
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1393
        // properly at annotate time.
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1394
        meth.defaultValue = value;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13635
diff changeset
  1395
        annotate.normal(new AnnotationDefaultCompleter(meth, value));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1396
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1397
06bc494ca11e Initial load
duke
parents:
diff changeset
  1398
    Type readTypeOrClassSymbol(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1399
        // support preliminary jsr175-format class files
06bc494ca11e Initial load
duke
parents:
diff changeset
  1400
        if (buf[poolIdx[i]] == CONSTANT_Class)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1401
            return readClassSymbol(i).type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1402
        return readType(i);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1403
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1404
    Type readEnumType(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1405
        // support preliminary jsr175-format class files
06bc494ca11e Initial load
duke
parents:
diff changeset
  1406
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
  1407
        int length = getChar(index + 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1408
        if (buf[index + length + 2] != ';')
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
  1409
            return syms.enterClass(readName(i)).type;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1410
        return readType(i);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1411
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1412
06bc494ca11e Initial load
duke
parents:
diff changeset
  1413
    CompoundAnnotationProxy readCompoundAnnotation() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1414
        Type t = readTypeOrClassSymbol(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1415
        int numFields = nextChar();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1416
        ListBuffer<Pair<Name,Attribute>> pairs = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1417
        for (int i=0; i<numFields; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1418
            Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1419
            Attribute value = readAttributeValue();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1420
            pairs.append(new Pair<>(name, value));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1421
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1422
        return new CompoundAnnotationProxy(t, pairs.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1423
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1424
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1425
    TypeAnnotationProxy readTypeAnnotation() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1426
        TypeAnnotationPosition position = readPosition();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1427
        CompoundAnnotationProxy proxy = readCompoundAnnotation();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1428
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1429
        return new TypeAnnotationProxy(proxy, position);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1430
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1431
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1432
    TypeAnnotationPosition readPosition() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1433
        int tag = nextByte(); // TargetType tag is a byte
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1434
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1435
        if (!TargetType.isValidTargetTypeValue(tag))
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  1436
            throw badClassFile("bad.type.annotation.value", String.format("0x%02X", tag));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1437
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1438
        TargetType type = TargetType.fromTargetTypeValue(tag);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1439
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1440
        switch (type) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1441
        // instanceof
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1442
        case INSTANCEOF: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1443
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1444
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1445
                TypeAnnotationPosition.instanceOf(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1446
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1447
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1448
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1449
        // new expression
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1450
        case NEW: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1451
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1452
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1453
                TypeAnnotationPosition.newObj(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1454
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1455
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1456
        }
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15385
diff changeset
  1457
        // constructor/method reference receiver
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1458
        case CONSTRUCTOR_REFERENCE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1459
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1460
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1461
                TypeAnnotationPosition.constructorRef(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1462
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1463
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1464
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1465
        case METHOD_REFERENCE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1466
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1467
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1468
                TypeAnnotationPosition.methodRef(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1469
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1470
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1471
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1472
        // local variable
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1473
        case LOCAL_VARIABLE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1474
            final int table_length = nextChar();
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1475
            final int[] newLvarOffset = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1476
            final int[] newLvarLength = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1477
            final int[] newLvarIndex = new int[table_length];
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1478
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1479
            for (int i = 0; i < table_length; ++i) {
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1480
                newLvarOffset[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1481
                newLvarLength[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1482
                newLvarIndex[i] = nextChar();
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1483
            }
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1484
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1485
            final TypeAnnotationPosition position =
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1486
                    TypeAnnotationPosition.localVariable(readTypePath());
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1487
            position.lvarOffset = newLvarOffset;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1488
            position.lvarLength = newLvarLength;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1489
            position.lvarIndex = newLvarIndex;
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1490
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1491
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1492
        // resource variable
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1493
        case RESOURCE_VARIABLE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1494
            final int table_length = nextChar();
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1495
            final int[] newLvarOffset = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1496
            final int[] newLvarLength = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1497
            final int[] newLvarIndex = new int[table_length];
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1498
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1499
            for (int i = 0; i < table_length; ++i) {
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1500
                newLvarOffset[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1501
                newLvarLength[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1502
                newLvarIndex[i] = nextChar();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1503
            }
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1504
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1505
            final TypeAnnotationPosition position =
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1506
                    TypeAnnotationPosition.resourceVariable(readTypePath());
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1507
            position.lvarOffset = newLvarOffset;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1508
            position.lvarLength = newLvarLength;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1509
            position.lvarIndex = newLvarIndex;
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1510
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1511
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1512
        // exception parameter
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1513
        case EXCEPTION_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1514
            final int exception_index = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1515
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1516
                TypeAnnotationPosition.exceptionParameter(readTypePath());
23975
c7c81595aea9 8040319: Clean up type annotation exception index generating code in Code.java
emc
parents: 23790
diff changeset
  1517
            position.setExceptionIndex(exception_index);
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1518
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1519
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1520
        // method receiver
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1521
        case METHOD_RECEIVER:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1522
            return TypeAnnotationPosition.methodReceiver(readTypePath());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1523
        // type parameter
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1524
        case CLASS_TYPE_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1525
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1526
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1527
                .typeParameter(readTypePath(), parameter_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1528
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1529
        case METHOD_TYPE_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1530
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1531
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1532
                .methodTypeParameter(readTypePath(), parameter_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1533
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1534
        // type parameter bound
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1535
        case CLASS_TYPE_PARAMETER_BOUND: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1536
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1537
            final int bound_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1538
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1539
                .typeParameterBound(readTypePath(), parameter_index,
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1540
                                    bound_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1541
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1542
        case METHOD_TYPE_PARAMETER_BOUND: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1543
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1544
            final int bound_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1545
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1546
                .methodTypeParameterBound(readTypePath(), parameter_index,
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1547
                                          bound_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1548
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1549
        // class extends or implements clause
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1550
        case CLASS_EXTENDS: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1551
            final int type_index = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1552
            return TypeAnnotationPosition.classExtends(readTypePath(),
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1553
                                                       type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1554
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1555
        // throws
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1556
        case THROWS: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1557
            final int type_index = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1558
            return TypeAnnotationPosition.methodThrows(readTypePath(),
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1559
                                                       type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1560
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1561
        // method parameter
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1562
        case METHOD_FORMAL_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1563
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1564
            return TypeAnnotationPosition.methodParameter(readTypePath(),
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1565
                                                          parameter_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1566
        }
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15385
diff changeset
  1567
        // type cast
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1568
        case CAST: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1569
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1570
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1571
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1572
                TypeAnnotationPosition.typeCast(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1573
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1574
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1575
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1576
        // method/constructor/reference type argument
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1577
        case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1578
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1579
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1580
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1581
                .constructorInvocationTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1582
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1583
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1584
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1585
        case METHOD_INVOCATION_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1586
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1587
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1588
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1589
                .methodInvocationTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1590
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1591
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1592
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1593
        case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1594
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1595
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1596
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1597
                .constructorRefTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1598
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1599
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1600
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1601
        case METHOD_REFERENCE_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1602
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1603
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1604
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1605
                .methodRefTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1606
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1607
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1608
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1609
        // We don't need to worry about these
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1610
        case METHOD_RETURN:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1611
            return TypeAnnotationPosition.methodReturn(readTypePath());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1612
        case FIELD:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1613
            return TypeAnnotationPosition.field(readTypePath());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1614
        case UNKNOWN:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1615
            throw new AssertionError("jvm.ClassReader: UNKNOWN target type should never occur!");
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1616
        default:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1617
            throw new AssertionError("jvm.ClassReader: Unknown target type for position: " + type);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1618
        }
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1619
    }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1620
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1621
    List<TypeAnnotationPosition.TypePathEntry> readTypePath() {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1622
        int len = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1623
        ListBuffer<Integer> loc = new ListBuffer<>();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1624
        for (int i = 0; i < len * TypeAnnotationPosition.TypePathEntry.bytesPerEntry; ++i)
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1625
            loc = loc.append(nextByte());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1626
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1627
        return TypeAnnotationPosition.getTypePathFromBinary(loc.toList());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1628
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1629
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1630
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1631
    Attribute readAttributeValue() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1632
        char c = (char) buf[bp++];
06bc494ca11e Initial load
duke
parents:
diff changeset
  1633
        switch (c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1634
        case 'B':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1635
            return new Attribute.Constant(syms.byteType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1636
        case 'C':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1637
            return new Attribute.Constant(syms.charType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1638
        case 'D':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1639
            return new Attribute.Constant(syms.doubleType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1640
        case 'F':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1641
            return new Attribute.Constant(syms.floatType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1642
        case 'I':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1643
            return new Attribute.Constant(syms.intType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1644
        case 'J':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1645
            return new Attribute.Constant(syms.longType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1646
        case 'S':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1647
            return new Attribute.Constant(syms.shortType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1648
        case 'Z':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1649
            return new Attribute.Constant(syms.booleanType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1650
        case 's':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1651
            return new Attribute.Constant(syms.stringType, readPool(nextChar()).toString());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1652
        case 'e':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1653
            return new EnumAttributeProxy(readEnumType(nextChar()), readName(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1654
        case 'c':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1655
            return new Attribute.Class(types, readTypeOrClassSymbol(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1656
        case '[': {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1657
            int n = nextChar();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1658
            ListBuffer<Attribute> l = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1659
            for (int i=0; i<n; i++)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1660
                l.append(readAttributeValue());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1661
            return new ArrayAttributeProxy(l.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1662
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1663
        case '@':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1664
            return readCompoundAnnotation();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1665
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1666
            throw new AssertionError("unknown annotation tag '" + c + "'");
06bc494ca11e Initial load
duke
parents:
diff changeset
  1667
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1668
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1669
06bc494ca11e Initial load
duke
parents:
diff changeset
  1670
    interface ProxyVisitor extends Attribute.Visitor {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1671
        void visitEnumAttributeProxy(EnumAttributeProxy proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1672
        void visitArrayAttributeProxy(ArrayAttributeProxy proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1673
        void visitCompoundAnnotationProxy(CompoundAnnotationProxy proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1674
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1675
06bc494ca11e Initial load
duke
parents:
diff changeset
  1676
    static class EnumAttributeProxy extends Attribute {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1677
        Type enumType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1678
        Name enumerator;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1679
        public EnumAttributeProxy(Type enumType, Name enumerator) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1680
            super(null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1681
            this.enumType = enumType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1682
            this.enumerator = enumerator;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1683
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1684
        public void accept(Visitor v) { ((ProxyVisitor)v).visitEnumAttributeProxy(this); }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1685
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1686
        public String toString() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1687
            return "/*proxy enum*/" + enumType + "." + enumerator;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1688
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1689
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1690
06bc494ca11e Initial load
duke
parents:
diff changeset
  1691
    static class ArrayAttributeProxy extends Attribute {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1692
        List<Attribute> values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1693
        ArrayAttributeProxy(List<Attribute> values) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1694
            super(null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1695
            this.values = values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1696
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1697
        public void accept(Visitor v) { ((ProxyVisitor)v).visitArrayAttributeProxy(this); }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1698
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1699
        public String toString() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1700
            return "{" + values + "}";
06bc494ca11e Initial load
duke
parents:
diff changeset
  1701
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1702
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1703
06bc494ca11e Initial load
duke
parents:
diff changeset
  1704
    /** A temporary proxy representing a compound attribute.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1705
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1706
    static class CompoundAnnotationProxy extends Attribute {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1707
        final List<Pair<Name,Attribute>> values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1708
        public CompoundAnnotationProxy(Type type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1709
                                      List<Pair<Name,Attribute>> values) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1710
            super(type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1711
            this.values = values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1712
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1713
        public void accept(Visitor v) { ((ProxyVisitor)v).visitCompoundAnnotationProxy(this); }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1714
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1715
        public String toString() {
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1716
            StringBuilder buf = new StringBuilder();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1717
            buf.append("@");
06bc494ca11e Initial load
duke
parents:
diff changeset
  1718
            buf.append(type.tsym.getQualifiedName());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1719
            buf.append("/*proxy*/{");
06bc494ca11e Initial load
duke
parents:
diff changeset
  1720
            boolean first = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1721
            for (List<Pair<Name,Attribute>> v = values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1722
                 v.nonEmpty(); v = v.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1723
                Pair<Name,Attribute> value = v.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1724
                if (!first) buf.append(",");
06bc494ca11e Initial load
duke
parents:
diff changeset
  1725
                first = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1726
                buf.append(value.fst);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1727
                buf.append("=");
06bc494ca11e Initial load
duke
parents:
diff changeset
  1728
                buf.append(value.snd);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1729
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1730
            buf.append("}");
06bc494ca11e Initial load
duke
parents:
diff changeset
  1731
            return buf.toString();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1732
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1733
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1734
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1735
    /** A temporary proxy representing a type annotation.
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1736
     */
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1737
    static class TypeAnnotationProxy {
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1738
        final CompoundAnnotationProxy compound;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1739
        final TypeAnnotationPosition position;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1740
        public TypeAnnotationProxy(CompoundAnnotationProxy compound,
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1741
                TypeAnnotationPosition position) {
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1742
            this.compound = compound;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1743
            this.position = position;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1744
        }
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1745
    }
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1746
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1747
    class AnnotationDeproxy implements ProxyVisitor {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1748
        private ClassSymbol requestingOwner = currentOwner.kind == MTH
06bc494ca11e Initial load
duke
parents:
diff changeset
  1749
            ? currentOwner.enclClass() : (ClassSymbol)currentOwner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1750
06bc494ca11e Initial load
duke
parents:
diff changeset
  1751
        List<Attribute.Compound> deproxyCompoundList(List<CompoundAnnotationProxy> pl) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1752
            // also must fill in types!!!!
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1753
            ListBuffer<Attribute.Compound> buf = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1754
            for (List<CompoundAnnotationProxy> l = pl; l.nonEmpty(); l=l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1755
                buf.append(deproxyCompound(l.head));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1756
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1757
            return buf.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1758
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1759
06bc494ca11e Initial load
duke
parents:
diff changeset
  1760
        Attribute.Compound deproxyCompound(CompoundAnnotationProxy a) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1761
            ListBuffer<Pair<Symbol.MethodSymbol,Attribute>> buf = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1762
            for (List<Pair<Name,Attribute>> l = a.values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1763
                 l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1764
                 l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1765
                MethodSymbol meth = findAccessMethod(a.type, l.head.fst);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1766
                buf.append(new Pair<>(meth, deproxy(meth.type.getReturnType(), l.head.snd)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1767
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1768
            return new Attribute.Compound(a.type, buf.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1769
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1770
06bc494ca11e Initial load
duke
parents:
diff changeset
  1771
        MethodSymbol findAccessMethod(Type container, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1772
            CompletionFailure failure = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1773
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1774
                for (Scope.Entry e = container.tsym.members().lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1775
                     e.scope != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1776
                     e = e.next()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1777
                    Symbol sym = e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1778
                    if (sym.kind == MTH && sym.type.getParameterTypes().length() == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1779
                        return (MethodSymbol) sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1780
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1781
            } catch (CompletionFailure ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1782
                failure = ex;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1783
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1784
            // The method wasn't found: emit a warning and recover
06bc494ca11e Initial load
duke
parents:
diff changeset
  1785
            JavaFileObject prevSource = log.useSource(requestingOwner.classfile);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1786
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1787
                if (failure == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1788
                    log.warning("annotation.method.not.found",
06bc494ca11e Initial load
duke
parents:
diff changeset
  1789
                                container,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1790
                                name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1791
                } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1792
                    log.warning("annotation.method.not.found.reason",
06bc494ca11e Initial load
duke
parents:
diff changeset
  1793
                                container,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1794
                                name,
939
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 815
diff changeset
  1795
                                failure.getDetailValue());//diagnostic, if present
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1796
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1797
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1798
                log.useSource(prevSource);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1799
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1800
            // Construct a new method type and symbol.  Use bottom
06bc494ca11e Initial load
duke
parents:
diff changeset
  1801
            // type (typeof null) as return type because this type is
06bc494ca11e Initial load
duke
parents:
diff changeset
  1802
            // a subtype of all reference types and can be converted
06bc494ca11e Initial load
duke
parents:
diff changeset
  1803
            // to primitive types by unboxing.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1804
            MethodType mt = new MethodType(List.<Type>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1805
                                           syms.botType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1806
                                           List.<Type>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1807
                                           syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1808
            return new MethodSymbol(PUBLIC | ABSTRACT, name, mt, container.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1809
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1810
06bc494ca11e Initial load
duke
parents:
diff changeset
  1811
        Attribute result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1812
        Type type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1813
        Attribute deproxy(Type t, Attribute a) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1814
            Type oldType = type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1815
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1816
                type = t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1817
                a.accept(this);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1818
                return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1819
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1820
                type = oldType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1821
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1822
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1823
06bc494ca11e Initial load
duke
parents:
diff changeset
  1824
        // implement Attribute.Visitor below
06bc494ca11e Initial load
duke
parents:
diff changeset
  1825
06bc494ca11e Initial load
duke
parents:
diff changeset
  1826
        public void visitConstant(Attribute.Constant value) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1827
            // assert value.type == type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1828
            result = value;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1829
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1830
06bc494ca11e Initial load
duke
parents:
diff changeset
  1831
        public void visitClass(Attribute.Class clazz) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1832
            result = clazz;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1833
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1834
06bc494ca11e Initial load
duke
parents:
diff changeset
  1835
        public void visitEnum(Attribute.Enum e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1836
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  1837
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1838
06bc494ca11e Initial load
duke
parents:
diff changeset
  1839
        public void visitCompound(Attribute.Compound compound) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1840
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  1841
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1842
06bc494ca11e Initial load
duke
parents:
diff changeset
  1843
        public void visitArray(Attribute.Array array) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1844
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  1845
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1846
06bc494ca11e Initial load
duke
parents:
diff changeset
  1847
        public void visitError(Attribute.Error e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1848
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  1849
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1850
06bc494ca11e Initial load
duke
parents:
diff changeset
  1851
        public void visitEnumAttributeProxy(EnumAttributeProxy proxy) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1852
            // type.tsym.flatName() should == proxy.enumFlatName
06bc494ca11e Initial load
duke
parents:
diff changeset
  1853
            TypeSymbol enumTypeSym = proxy.enumType.tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1854
            VarSymbol enumerator = null;
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1855
            CompletionFailure failure = null;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1856
            try {
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1857
                for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator);
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1858
                     e.scope != null;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1859
                     e = e.next()) {
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1860
                    if (e.sym.kind == VAR) {
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1861
                        enumerator = (VarSymbol)e.sym;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1862
                        break;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1863
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1864
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1865
            }
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1866
            catch (CompletionFailure ex) {
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1867
                failure = ex;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1868
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1869
            if (enumerator == null) {
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1870
                if (failure != null) {
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1871
                    log.warning("unknown.enum.constant.reason",
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1872
                              currentClassFile, enumTypeSym, proxy.enumerator,
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1873
                              failure.getDiagnostic());
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1874
                } else {
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1875
                    log.warning("unknown.enum.constant",
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1876
                              currentClassFile, enumTypeSym, proxy.enumerator);
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1877
                }
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1878
                result = new Attribute.Enum(enumTypeSym.type,
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  1879
                        new VarSymbol(0, proxy.enumerator, syms.botType, enumTypeSym));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1880
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1881
                result = new Attribute.Enum(enumTypeSym.type, enumerator);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1882
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1883
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1884
06bc494ca11e Initial load
duke
parents:
diff changeset
  1885
        public void visitArrayAttributeProxy(ArrayAttributeProxy proxy) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1886
            int length = proxy.values.length();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1887
            Attribute[] ats = new Attribute[length];
06bc494ca11e Initial load
duke
parents:
diff changeset
  1888
            Type elemtype = types.elemtype(type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1889
            int i = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1890
            for (List<Attribute> p = proxy.values; p.nonEmpty(); p = p.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1891
                ats[i++] = deproxy(elemtype, p.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1892
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1893
            result = new Attribute.Array(type, ats);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1894
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1895
06bc494ca11e Initial load
duke
parents:
diff changeset
  1896
        public void visitCompoundAnnotationProxy(CompoundAnnotationProxy proxy) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1897
            result = deproxyCompound(proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1898
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1899
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1900
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  1901
    class AnnotationDefaultCompleter extends AnnotationDeproxy implements Annotate.Worker {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1902
        final MethodSymbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1903
        final Attribute value;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1904
        final JavaFileObject classFile = currentClassFile;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1905
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1906
        public String toString() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1907
            return " ClassReader store default for " + sym.owner + "." + sym + " is " + value;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1908
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1909
        AnnotationDefaultCompleter(MethodSymbol sym, Attribute value) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1910
            this.sym = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1911
            this.value = value;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1912
        }
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  1913
        // implement Annotate.Worker.run()
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  1914
        public void run() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1915
            JavaFileObject previousClassFile = currentClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1916
            try {
14804
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1917
                // Reset the interim value set earlier in
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1918
                // attachAnnotationDefault().
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1919
                sym.defaultValue = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1920
                currentClassFile = classFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1921
                sym.defaultValue = deproxy(sym.type.getReturnType(), value);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1922
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1923
                currentClassFile = previousClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1924
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1925
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1926
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1927
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  1928
    class AnnotationCompleter extends AnnotationDeproxy implements Annotate.Worker {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1929
        final Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1930
        final List<CompoundAnnotationProxy> l;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1931
        final JavaFileObject classFile;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1932
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1933
        public String toString() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1934
            return " ClassReader annotate " + sym.owner + "." + sym + " with " + l;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1935
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1936
        AnnotationCompleter(Symbol sym, List<CompoundAnnotationProxy> l) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1937
            this.sym = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1938
            this.l = l;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1939
            this.classFile = currentClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1940
        }
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  1941
        // implement Annotate.Worker.run()
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  1942
        public void run() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1943
            JavaFileObject previousClassFile = currentClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1944
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1945
                currentClassFile = classFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1946
                List<Attribute.Compound> newList = deproxyCompoundList(l);
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17578
diff changeset
  1947
                if (sym.annotationsPendingCompletion()) {
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17578
diff changeset
  1948
                    sym.setDeclarationAttributes(newList);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13635
diff changeset
  1949
                } else {
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17578
diff changeset
  1950
                    sym.appendAttributes(newList);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13635
diff changeset
  1951
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1952
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1953
                currentClassFile = previousClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1954
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1955
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1956
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1957
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1958
    class TypeAnnotationCompleter extends AnnotationCompleter {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1959
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1960
        List<TypeAnnotationProxy> proxies;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1961
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1962
        TypeAnnotationCompleter(Symbol sym,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1963
                List<TypeAnnotationProxy> proxies) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1964
            super(sym, List.<CompoundAnnotationProxy>nil());
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1965
            this.proxies = proxies;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1966
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1967
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1968
        List<Attribute.TypeCompound> deproxyTypeCompoundList(List<TypeAnnotationProxy> proxies) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20242
diff changeset
  1969
            ListBuffer<Attribute.TypeCompound> buf = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1970
            for (TypeAnnotationProxy proxy: proxies) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1971
                Attribute.Compound compound = deproxyCompound(proxy.compound);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1972
                Attribute.TypeCompound typeCompound = new Attribute.TypeCompound(compound, proxy.position);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1973
                buf.add(typeCompound);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1974
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1975
            return buf.toList();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1976
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1977
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1978
        @Override
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  1979
        public void run() {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1980
            JavaFileObject previousClassFile = currentClassFile;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1981
            try {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1982
                currentClassFile = classFile;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1983
                List<Attribute.TypeCompound> newList = deproxyTypeCompoundList(proxies);
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17578
diff changeset
  1984
                sym.setTypeAttributes(newList.prependList(sym.getRawTypeAttributes()));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1985
            } finally {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1986
                currentClassFile = previousClassFile;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1987
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1988
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1989
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1990
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1991
06bc494ca11e Initial load
duke
parents:
diff changeset
  1992
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1993
 * Reading Symbols
06bc494ca11e Initial load
duke
parents:
diff changeset
  1994
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1995
06bc494ca11e Initial load
duke
parents:
diff changeset
  1996
    /** Read a field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1997
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1998
    VarSymbol readField() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1999
        long flags = adjustFieldFlags(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2000
        Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2001
        Type type = readType(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2002
        VarSymbol v = new VarSymbol(flags, name, type, currentOwner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2003
        readMemberAttrs(v);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2004
        return v;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2005
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2006
06bc494ca11e Initial load
duke
parents:
diff changeset
  2007
    /** Read a method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2008
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2009
    MethodSymbol readMethod() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2010
        long flags = adjustMethodFlags(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2011
        Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2012
        Type type = readType(nextChar());
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2013
        if (currentOwner.isInterface() &&
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2014
                (flags & ABSTRACT) == 0 && !name.equals(names.clinit)) {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2015
            if (majorVersion > Target.JDK1_8.majorVersion ||
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2016
                    (majorVersion == Target.JDK1_8.majorVersion && minorVersion >= Target.JDK1_8.minorVersion)) {
21006
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2017
                if ((flags & STATIC) == 0) {
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2018
                    currentOwner.flags_field |= DEFAULT;
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2019
                    flags |= DEFAULT | ABSTRACT;
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2020
                }
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2021
            } else {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2022
                //protect against ill-formed classfiles
21006
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2023
                throw badClassFile((flags & STATIC) == 0 ? "invalid.default.interface" : "invalid.static.interface",
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2024
                                   Integer.toString(majorVersion),
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2025
                                   Integer.toString(minorVersion));
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2026
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2027
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2028
        if (name == names.init && currentOwner.hasOuterInstance()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2029
            // Sometimes anonymous classes don't have an outer
06bc494ca11e Initial load
duke
parents:
diff changeset
  2030
            // instance, however, there is no reliable way to tell so
06bc494ca11e Initial load
duke
parents:
diff changeset
  2031
            // we never strip this$n
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 939
diff changeset
  2032
            if (!currentOwner.name.isEmpty())
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2033
                type = new MethodType(adjustMethodParams(flags, type.getParameterTypes()),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2034
                                      type.getReturnType(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2035
                                      type.getThrownTypes(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2036
                                      syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2037
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2038
        MethodSymbol m = new MethodSymbol(flags, name, type, currentOwner);
18389
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18010
diff changeset
  2039
        if (types.isSignaturePolymorphic(m)) {
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18010
diff changeset
  2040
            m.flags_field |= SIGNATURE_POLYMORPHIC;
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18010
diff changeset
  2041
        }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2042
        if (saveParameterNames)
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2043
            initParameterNames(m);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2044
        Symbol prevOwner = currentOwner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2045
        currentOwner = m;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2046
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2047
            readMemberAttrs(m);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2048
        } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2049
            currentOwner = prevOwner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2050
        }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2051
        if (saveParameterNames)
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2052
            setParameterNames(m, type);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2053
        return m;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2054
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2055
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2056
    private List<Type> adjustMethodParams(long flags, List<Type> args) {
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2057
        boolean isVarargs = (flags & VARARGS) != 0;
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2058
        if (isVarargs) {
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2059
            Type varargsElem = args.last();
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20242
diff changeset
  2060
            ListBuffer<Type> adjustedArgs = new ListBuffer<>();
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2061
            for (Type t : args) {
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2062
                adjustedArgs.append(t != varargsElem ?
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2063
                    t :
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2064
                    ((ArrayType)t).makeVarargs());
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2065
            }
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2066
            args = adjustedArgs.toList();
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2067
        }
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2068
        return args.tail;
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2069
    }
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2070
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2071
    /**
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2072
     * Init the parameter names array.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2073
     * Parameter names are currently inferred from the names in the
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2074
     * LocalVariableTable attributes of a Code attribute.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2075
     * (Note: this means parameter names are currently not available for
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2076
     * methods without a Code attribute.)
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2077
     * This method initializes an array in which to store the name indexes
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2078
     * of parameter names found in LocalVariableTable attributes. It is
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2079
     * slightly supersized to allow for additional slots with a start_pc of 0.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2080
     */
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2081
    void initParameterNames(MethodSymbol sym) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2082
        // make allowance for synthetic parameters.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2083
        final int excessSlots = 4;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2084
        int expectedParameterSlots =
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2085
                Code.width(sym.type.getParameterTypes()) + excessSlots;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2086
        if (parameterNameIndices == null
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2087
                || parameterNameIndices.length < expectedParameterSlots) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2088
            parameterNameIndices = new int[expectedParameterSlots];
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2089
        } else
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2090
            Arrays.fill(parameterNameIndices, 0);
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2091
        haveParameterNameIndices = false;
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2092
        sawMethodParameters = false;
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2093
    }
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2094
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2095
    /**
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2096
     * Set the parameter names for a symbol from the name index in the
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2097
     * parameterNameIndicies array. The type of the symbol may have changed
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2098
     * while reading the method attributes (see the Signature attribute).
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2099
     * This may be because of generic information or because anonymous
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2100
     * synthetic parameters were added.   The original type (as read from
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2101
     * the method descriptor) is used to help guess the existence of
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2102
     * anonymous synthetic parameters.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2103
     * On completion, sym.savedParameter names will either be null (if
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2104
     * no parameter names were found in the class file) or will be set to a
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2105
     * list of names, one per entry in sym.type.getParameterTypes, with
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2106
     * any missing names represented by the empty name.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2107
     */
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2108
    void setParameterNames(MethodSymbol sym, Type jvmType) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2109
        // if no names were found in the class file, there's nothing more to do
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2110
        if (!haveParameterNameIndices)
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2111
            return;
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2112
        // If we get parameter names from MethodParameters, then we
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2113
        // don't need to skip.
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2114
        int firstParam = 0;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2115
        if (!sawMethodParameters) {
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2116
            firstParam = ((sym.flags() & STATIC) == 0) ? 1 : 0;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2117
            // the code in readMethod may have skipped the first
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2118
            // parameter when setting up the MethodType. If so, we
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2119
            // make a corresponding allowance here for the position of
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2120
            // the first parameter.  Note that this assumes the
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2121
            // skipped parameter has a width of 1 -- i.e. it is not
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2122
        // a double width type (long or double.)
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2123
        if (sym.name == names.init && currentOwner.hasOuterInstance()) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2124
            // Sometimes anonymous classes don't have an outer
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2125
            // instance, however, there is no reliable way to tell so
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2126
            // we never strip this$n
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2127
            if (!currentOwner.name.isEmpty())
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2128
                firstParam += 1;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2129
        }
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2130
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2131
        if (sym.type != jvmType) {
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2132
                // reading the method attributes has caused the
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2133
                // symbol's type to be changed. (i.e. the Signature
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2134
                // attribute.)  This may happen if there are hidden
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2135
                // (synthetic) parameters in the descriptor, but not
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2136
                // in the Signature.  The position of these hidden
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2137
                // parameters is unspecified; for now, assume they are
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2138
                // at the beginning, and so skip over them. The
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2139
                // primary case for this is two hidden parameters
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2140
                // passed into Enum constructors.
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2141
            int skip = Code.width(jvmType.getParameterTypes())
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2142
                    - Code.width(sym.type.getParameterTypes());
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2143
            firstParam += skip;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2144
        }
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2145
        }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2146
        List<Name> paramNames = List.nil();
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2147
        int index = firstParam;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2148
        for (Type t: sym.type.getParameterTypes()) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2149
            int nameIdx = (index < parameterNameIndices.length
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2150
                    ? parameterNameIndices[index] : 0);
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2151
            Name name = nameIdx == 0 ? names.empty : readName(nameIdx);
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2152
            paramNames = paramNames.prepend(name);
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2153
            index += Code.width(t);
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2154
        }
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2155
        sym.savedParameterNames = paramNames.reverse();
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2156
    }
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2157
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2158
    /**
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2159
     * skip n bytes
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2160
     */
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2161
    void skipBytes(int n) {
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2162
        bp = bp + n;
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2163
    }
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2164
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2165
    /** Skip a field or method
06bc494ca11e Initial load
duke
parents:
diff changeset
  2166
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2167
    void skipMember() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2168
        bp = bp + 6;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2169
        char ac = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2170
        for (int i = 0; i < ac; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2171
            bp = bp + 2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2172
            int attrLen = nextInt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2173
            bp = bp + attrLen;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2174
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2175
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2176
06bc494ca11e Initial load
duke
parents:
diff changeset
  2177
    /** Enter type variables of this classtype and all enclosing ones in
06bc494ca11e Initial load
duke
parents:
diff changeset
  2178
     *  `typevars'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2179
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2180
    protected void enterTypevars(Type t) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 13689
diff changeset
  2181
        if (t.getEnclosingType() != null && t.getEnclosingType().hasTag(CLASS))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2182
            enterTypevars(t.getEnclosingType());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2183
        for (List<Type> xs = t.getTypeArguments(); xs.nonEmpty(); xs = xs.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2184
            typevars.enter(xs.head.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2185
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2186
06bc494ca11e Initial load
duke
parents:
diff changeset
  2187
    protected void enterTypevars(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2188
        if (sym.owner.kind == MTH) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2189
            enterTypevars(sym.owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2190
            enterTypevars(sym.owner.owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2191
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2192
        enterTypevars(sym.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2193
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2194
06bc494ca11e Initial load
duke
parents:
diff changeset
  2195
    /** Read contents of a given class symbol `c'. Both external and internal
06bc494ca11e Initial load
duke
parents:
diff changeset
  2196
     *  versions of an inner class are read.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2197
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2198
    void readClass(ClassSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2199
        ClassType ct = (ClassType)c.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2200
06bc494ca11e Initial load
duke
parents:
diff changeset
  2201
        // allocate scope for members
8242
3873b4aaf4a8 7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents: 8241
diff changeset
  2202
        c.members_field = new Scope(c);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2203
06bc494ca11e Initial load
duke
parents:
diff changeset
  2204
        // prepare type variable table
06bc494ca11e Initial load
duke
parents:
diff changeset
  2205
        typevars = typevars.dup(currentOwner);
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 13689
diff changeset
  2206
        if (ct.getEnclosingType().hasTag(CLASS))
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  2207
            enterTypevars(ct.getEnclosingType());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2208
06bc494ca11e Initial load
duke
parents:
diff changeset
  2209
        // read flags, or skip if this is an inner class
06bc494ca11e Initial load
duke
parents:
diff changeset
  2210
        long flags = adjustClassFlags(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2211
        if (c.owner.kind == PCK) c.flags_field = flags;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2212
06bc494ca11e Initial load
duke
parents:
diff changeset
  2213
        // read own class name and check that it matches
06bc494ca11e Initial load
duke
parents:
diff changeset
  2214
        ClassSymbol self = readClassSymbol(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2215
        if (c != self)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2216
            throw badClassFile("class.file.wrong.class",
06bc494ca11e Initial load
duke
parents:
diff changeset
  2217
                               self.flatname);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2218
06bc494ca11e Initial load
duke
parents:
diff changeset
  2219
        // class attributes must be read before class
06bc494ca11e Initial load
duke
parents:
diff changeset
  2220
        // skip ahead to read class attributes
06bc494ca11e Initial load
duke
parents:
diff changeset
  2221
        int startbp = bp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2222
        nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2223
        char interfaceCount = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2224
        bp += interfaceCount * 2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2225
        char fieldCount = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2226
        for (int i = 0; i < fieldCount; i++) skipMember();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2227
        char methodCount = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2228
        for (int i = 0; i < methodCount; i++) skipMember();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2229
        readClassAttrs(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2230
06bc494ca11e Initial load
duke
parents:
diff changeset
  2231
        if (readAllOfClassFile) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2232
            for (int i = 1; i < poolObj.length; i++) readPool(i);
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  2233
            c.pool = new Pool(poolObj.length, poolObj, types);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2234
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2235
06bc494ca11e Initial load
duke
parents:
diff changeset
  2236
        // reset and read rest of classinfo
06bc494ca11e Initial load
duke
parents:
diff changeset
  2237
        bp = startbp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2238
        int n = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2239
        if (ct.supertype_field == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2240
            ct.supertype_field = (n == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2241
                ? Type.noType
06bc494ca11e Initial load
duke
parents:
diff changeset
  2242
                : readClassSymbol(n).erasure(types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2243
        n = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2244
        List<Type> is = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2245
        for (int i = 0; i < n; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2246
            Type _inter = readClassSymbol(nextChar()).erasure(types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2247
            is = is.prepend(_inter);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2248
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2249
        if (ct.interfaces_field == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2250
            ct.interfaces_field = is.reverse();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2251
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  2252
        Assert.check(fieldCount == nextChar());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2253
        for (int i = 0; i < fieldCount; i++) enterMember(c, readField());
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  2254
        Assert.check(methodCount == nextChar());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2255
        for (int i = 0; i < methodCount; i++) enterMember(c, readMethod());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2256
06bc494ca11e Initial load
duke
parents:
diff changeset
  2257
        typevars = typevars.leave();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2258
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2259
06bc494ca11e Initial load
duke
parents:
diff changeset
  2260
    /** Read inner class info. For each inner/outer pair allocate a
06bc494ca11e Initial load
duke
parents:
diff changeset
  2261
     *  member class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2262
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2263
    void readInnerClasses(ClassSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2264
        int n = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2265
        for (int i = 0; i < n; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2266
            nextChar(); // skip inner class symbol
06bc494ca11e Initial load
duke
parents:
diff changeset
  2267
            ClassSymbol outer = readClassSymbol(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2268
            Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2269
            if (name == null) name = names.empty;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2270
            long flags = adjustClassFlags(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2271
            if (outer != null) { // we have a member class
06bc494ca11e Initial load
duke
parents:
diff changeset
  2272
                if (name == names.empty)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2273
                    name = names.one;
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
  2274
                ClassSymbol member = syms.enterClass(name, outer);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2275
                if ((flags & STATIC) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2276
                    ((ClassType)member.type).setEnclosingType(outer.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2277
                    if (member.erasure_field != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2278
                        ((ClassType)member.erasure_field).setEnclosingType(types.erasure(outer.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2279
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2280
                if (c == outer) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2281
                    member.flags_field = flags;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2282
                    enterMember(c, member);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2283
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2284
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2285
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2286
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2287
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2288
    /** Read a class definition from the bytes in buf.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2289
     */
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2290
    private void readClassBuffer(ClassSymbol c) throws IOException {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2291
        int magic = nextInt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2292
        if (magic != JAVA_MAGIC)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2293
            throw badClassFile("illegal.start.of.class.file");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2294
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  2295
        minorVersion = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  2296
        majorVersion = nextChar();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2297
        int maxMajor = Target.MAX().majorVersion;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2298
        int maxMinor = Target.MAX().minorVersion;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2299
        if (majorVersion > maxMajor ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  2300
            majorVersion * 1000 + minorVersion <
06bc494ca11e Initial load
duke
parents:
diff changeset
  2301
            Target.MIN().majorVersion * 1000 + Target.MIN().minorVersion)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2302
        {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2303
            if (majorVersion == (maxMajor + 1))
06bc494ca11e Initial load
duke
parents:
diff changeset
  2304
                log.warning("big.major.version",
06bc494ca11e Initial load
duke
parents:
diff changeset
  2305
                            currentClassFile,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2306
                            majorVersion,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2307
                            maxMajor);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2308
            else
06bc494ca11e Initial load
duke
parents:
diff changeset
  2309
                throw badClassFile("wrong.version",
06bc494ca11e Initial load
duke
parents:
diff changeset
  2310
                                   Integer.toString(majorVersion),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2311
                                   Integer.toString(minorVersion),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2312
                                   Integer.toString(maxMajor),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2313
                                   Integer.toString(maxMinor));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2314
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2315
        else if (checkClassFile &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2316
                 majorVersion == maxMajor &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2317
                 minorVersion > maxMinor)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2318
        {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2319
            printCCF("found.later.version",
06bc494ca11e Initial load
duke
parents:
diff changeset
  2320
                     Integer.toString(minorVersion));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2321
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2322
        indexPool();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2323
        if (signatureBuffer.length < bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2324
            int ns = Integer.highestOneBit(bp) << 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2325
            signatureBuffer = new byte[ns];
06bc494ca11e Initial load
duke
parents:
diff changeset
  2326
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2327
        readClass(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2328
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2329
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2330
    public void readClassFile(ClassSymbol c) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2331
        currentOwner = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2332
        currentClassFile = c.classfile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2333
        warnedAttrs.clear();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2334
        filling = true;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2335
        try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2336
            bp = 0;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2337
            buf = readInputStream(buf, c.classfile.openInputStream());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2338
            readClassBuffer(c);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2339
            if (!missingTypeVariables.isEmpty() && !foundTypeVariables.isEmpty()) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2340
                List<Type> missing = missingTypeVariables;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2341
                List<Type> found = foundTypeVariables;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2342
                missingTypeVariables = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2343
                foundTypeVariables = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2344
                filling = false;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2345
                ClassType ct = (ClassType)currentOwner.type;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2346
                ct.supertype_field =
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2347
                    types.subst(ct.supertype_field, missing, found);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2348
                ct.interfaces_field =
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2349
                    types.subst(ct.interfaces_field, missing, found);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2350
            } else if (missingTypeVariables.isEmpty() !=
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2351
                       foundTypeVariables.isEmpty()) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2352
                Name name = missingTypeVariables.head.tsym.name;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2353
                throw badClassFile("undecl.type.var", name);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2354
            }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2355
        } catch (IOException ex) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2356
            throw badClassFile("unable.to.access.file", ex.getMessage());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2357
        } catch (ArrayIndexOutOfBoundsException ex) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2358
            throw badClassFile("bad.class.file", c.flatname);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2359
        } finally {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2360
            missingTypeVariables = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2361
            foundTypeVariables = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2362
            filling = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2363
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2364
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2365
    // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  2366
        private static byte[] readInputStream(byte[] buf, InputStream s) throws IOException {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2367
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2368
                buf = ensureCapacity(buf, s.available());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2369
                int r = s.read(buf);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2370
                int bp = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2371
                while (r != -1) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2372
                    bp += r;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2373
                    buf = ensureCapacity(buf, bp);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2374
                    r = s.read(buf, bp, buf.length - bp);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2375
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2376
                return buf;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2377
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2378
                try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2379
                    s.close();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2380
                } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2381
                    /* Ignore any errors, as this stream may have already
06bc494ca11e Initial load
duke
parents:
diff changeset
  2382
                     * thrown a related exception which is the one that
06bc494ca11e Initial load
duke
parents:
diff changeset
  2383
                     * should be reported.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2384
                     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2385
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2386
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2387
        }
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2388
        /*
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2389
         * ensureCapacity will increase the buffer as needed, taking note that
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2390
         * the new buffer will always be greater than the needed and never
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2391
         * exactly equal to the needed size or bp. If equal then the read (above)
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2392
         * will infinitely loop as buf.length - bp == 0.
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2393
         */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2394
        private static byte[] ensureCapacity(byte[] buf, int needed) {
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2395
            if (buf.length <= needed) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2396
                byte[] old = buf;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2397
                buf = new byte[Integer.highestOneBit(needed) << 1];
06bc494ca11e Initial load
duke
parents:
diff changeset
  2398
                System.arraycopy(old, 0, buf, 0, old.length);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2399
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2400
            return buf;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2401
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2402
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2403
    /** We can only read a single class file at a time; this
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2404
     *  flag keeps track of when we are currently reading a class
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2405
     *  file.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2406
     */
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2407
    public boolean filling = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2408
06bc494ca11e Initial load
duke
parents:
diff changeset
  2409
/************************************************************************
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2410
 * Adjusting flags
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2411
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2412
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2413
    long adjustFieldFlags(long flags) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2414
        return flags;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2415
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2416
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2417
    long adjustMethodFlags(long flags) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2418
        if ((flags & ACC_BRIDGE) != 0) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2419
            flags &= ~ACC_BRIDGE;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2420
            flags |= BRIDGE;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2421
            if (!allowGenerics)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2422
                flags &= ~SYNTHETIC;
24298
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2423
        }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2424
        if ((flags & ACC_VARARGS) != 0) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2425
            flags &= ~ACC_VARARGS;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2426
            flags |= VARARGS;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2427
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2428
        return flags;
24298
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2429
    }
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2430
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2431
    long adjustClassFlags(long flags) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2432
        return flags & ~ACC_SUPER; // SUPER and SYNCHRONIZED bits overloaded
24298
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2433
    }
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2434
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2435
    /** Output for "-checkclassfile" option.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2436
     *  @param key The key to look up the correct internationalized string.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2437
     *  @param arg An argument for substitution into the output string.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2438
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2439
    private void printCCF(String key, Object arg) {
11053
48713f779b1d 7108669: cleanup Log methods for direct printing to streams
jjg
parents: 9603
diff changeset
  2440
        log.printLines(key, arg);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2441
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2442
06bc494ca11e Initial load
duke
parents:
diff changeset
  2443
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  2444
     * A subclass of JavaFileObject for the sourcefile attribute found in a classfile.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2445
     * The attribute is only the last component of the original filename, so is unlikely
06bc494ca11e Initial load
duke
parents:
diff changeset
  2446
     * to be valid as is, so operations other than those to access the name throw
06bc494ca11e Initial load
duke
parents:
diff changeset
  2447
     * UnsupportedOperationException
06bc494ca11e Initial load
duke
parents:
diff changeset
  2448
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2449
    private static class SourceFileObject extends BaseFileObject {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2450
06bc494ca11e Initial load
duke
parents:
diff changeset
  2451
        /** The file's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2452
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2453
        private Name name;
810
e4b6a6d206e6 6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents: 731
diff changeset
  2454
        private Name flatname;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2455
810
e4b6a6d206e6 6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents: 731
diff changeset
  2456
        public SourceFileObject(Name name, Name flatname) {
e4b6a6d206e6 6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents: 731
diff changeset
  2457
            super(null); // no file manager; never referenced for this file object
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2458
            this.name = name;
810
e4b6a6d206e6 6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents: 731
diff changeset
  2459
            this.flatname = flatname;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2460
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2461
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2462
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2463
        public URI toUri() {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2464
            try {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2465
                return new URI(null, name.toString(), null);
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2466
            } catch (URISyntaxException e) {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2467
                throw new CannotCreateUriError(name.toString(), e);
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2468
            }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2469
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2470
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2471
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2472
        public String getName() {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2473
            return name.toString();
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2474
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2475
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2476
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2477
        public String getShortName() {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2478
            return getName();
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2479
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2480
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2481
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2482
        public JavaFileObject.Kind getKind() {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2483
            return getKind(getName());
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2484
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2485
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2486
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2487
        public InputStream openInputStream() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2488
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2489
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2490
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2491
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2492
        public OutputStream openOutputStream() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2493
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2494
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2495
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2496
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2497
        public CharBuffer getCharContent(boolean ignoreEncodingErrors) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2498
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2499
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2500
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2501
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2502
        public Reader openReader(boolean ignoreEncodingErrors) {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2503
            throw new UnsupportedOperationException();
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2504
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2505
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2506
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2507
        public Writer openWriter() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2508
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2509
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2510
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2511
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2512
        public long getLastModified() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2513
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2514
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2515
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2516
        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2517
        public boolean delete() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2518
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2519
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2520
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2521
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2522
        protected String inferBinaryName(Iterable<? extends File> path) {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2523
            return flatname.toString();
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2524
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2525
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2526
        @Override
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2527
        public boolean isNameCompatible(String simpleName, JavaFileObject.Kind kind) {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2528
            return true; // fail-safe mode
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2529
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2530
4073
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2531
        /**
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2532
         * Check if two file objects are equal.
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2533
         * SourceFileObjects are just placeholder objects for the value of a
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2534
         * SourceFile attribute, and do not directly represent specific files.
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2535
         * Two SourceFileObjects are equal if their names are equal.
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2536
         */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2537
        @Override
06bc494ca11e Initial load
duke
parents:
diff changeset
  2538
        public boolean equals(Object other) {
4073
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2539
            if (this == other)
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2540
                return true;
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2541
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2542
            if (!(other instanceof SourceFileObject))
06bc494ca11e Initial load
duke
parents:
diff changeset
  2543
                return false;
4073
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  2544
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2545
            SourceFileObject o = (SourceFileObject) other;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2546
            return name.equals(o.name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2547
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2548
06bc494ca11e Initial load
duke
parents:
diff changeset
  2549
        @Override
06bc494ca11e Initial load
duke
parents:
diff changeset
  2550
        public int hashCode() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2551
            return name.hashCode();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2552
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2553
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2554
}