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