src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
author cushon
Fri, 08 Mar 2019 09:41:03 -0800
changeset 54039 fd6c13481231
parent 51833 91fd24cf57d5
child 54339 f69a2f675f19
permissions -rw-r--r--
8220377: Unused field SourceFileObject.flatname Reviewed-by: jjg Contributed-by: Ron Shapiro <ronshapiro@google.com>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
     2
 * Copyright (c) 1999, 2018, 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;
43268
12436ebea906 8147414: java.nio.file.ClosedFileSystemException in javadoc
jjg
parents: 42973
diff changeset
    32
import java.nio.file.ClosedFileSystemException;
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
    33
import java.util.Arrays;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    34
import java.util.EnumSet;
06bc494ca11e Initial load
duke
parents:
diff changeset
    35
import java.util.HashMap;
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
    36
import java.util.HashSet;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    37
import java.util.Map;
06bc494ca11e Initial load
duke
parents:
diff changeset
    38
import java.util.Set;
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
    39
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
    40
import javax.lang.model.element.Modifier;
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
    41
import javax.lang.model.element.NestingKind;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
import javax.tools.JavaFileManager;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    43
import javax.tools.JavaFileObject;
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
    44
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47703
diff changeset
    45
import com.sun.tools.javac.code.Source.Feature;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
    46
import com.sun.tools.javac.comp.Annotate;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
    47
import com.sun.tools.javac.comp.Annotate.AnnotationTypeCompleter;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    48
import com.sun.tools.javac.code.*;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
    49
import com.sun.tools.javac.code.Directive.*;
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
    50
import com.sun.tools.javac.code.Lint.LintCategory;
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
    51
import com.sun.tools.javac.code.Scope.WriteableScope;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    52
import com.sun.tools.javac.code.Symbol.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    53
import com.sun.tools.javac.code.Symtab;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    54
import com.sun.tools.javac.code.Type.*;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
    55
import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata;
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
    56
import com.sun.tools.javac.file.BaseFileManager;
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
    57
import com.sun.tools.javac.file.PathFileObject;
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    58
import com.sun.tools.javac.jvm.ClassFile.NameAndType;
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    59
import com.sun.tools.javac.jvm.ClassFile.Version;
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39587
diff changeset
    60
import com.sun.tools.javac.main.Option;
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
    61
import com.sun.tools.javac.resources.CompilerProperties.Fragments;
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
    62
import com.sun.tools.javac.resources.CompilerProperties.Warnings;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    63
import com.sun.tools.javac.util.*;
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
    64
import com.sun.tools.javac.util.DefinedBy.Api;
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
    65
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    66
06bc494ca11e Initial load
duke
parents:
diff changeset
    67
import static com.sun.tools.javac.code.Flags.*;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
    68
import static com.sun.tools.javac.code.Kinds.Kind.*;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
    69
41991
cc8a2784dd4c 8166700: NPE during invoking getEnclosedElements() on javax.lang.model.element.Element instance representing a package
jlahoda
parents: 41935
diff changeset
    70
import com.sun.tools.javac.code.Scope.LookupKind;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
    71
29551
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
    72
import static com.sun.tools.javac.code.TypeTag.ARRAY;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 13689
diff changeset
    73
import static com.sun.tools.javac.code.TypeTag.CLASS;
20242
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
    74
import static com.sun.tools.javac.code.TypeTag.TYPEVAR;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
    75
import static com.sun.tools.javac.jvm.ClassFile.*;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
    76
import static com.sun.tools.javac.jvm.ClassFile.Version.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39587
diff changeset
    78
import static com.sun.tools.javac.main.Option.PARAMETERS;
6721
d92073844278 6988436: Cleanup javac option handling
jjg
parents: 6709
diff changeset
    79
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
/** This class provides operations to read a classfile into an internal
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
 *  representation. The internal representation is anchored in a
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
 *  ClassSymbol which contains in its scope symbol representations
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
 *  for all other definitions in the classfile. Top-level Classes themselves
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
 *  appear as members of the scopes of PackageSymbols.
06bc494ca11e Initial load
duke
parents:
diff changeset
    85
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    86
 *  <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
    87
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    88
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    89
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    90
 */
19921
58bcbe156057 8023974: Drop 'implements Completer' and 'implements SourceCompleter' from ClassReader resp. JavaCompiler.
jfranck
parents: 19915
diff changeset
    91
public class ClassReader {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    92
    /** The context key for the class reader. */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
    93
    protected static final Context.Key<ClassReader> classReaderKey = new Context.Key<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    94
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
    95
    public static final int INITIAL_BUFFER_SIZE = 0x0fff0;
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
    96
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
    97
    private final Annotate annotate;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
    /** Switch: verbose output.
06bc494ca11e Initial load
duke
parents:
diff changeset
   100
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
    boolean verbose;
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
06bc494ca11e Initial load
duke
parents:
diff changeset
   103
    /** Switch: read constant pool and code sections. This switch is initially
06bc494ca11e Initial load
duke
parents:
diff changeset
   104
     *  set to false but can be turned on from outside.
06bc494ca11e Initial load
duke
parents:
diff changeset
   105
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   106
    public boolean readAllOfClassFile = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   107
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   108
    /** Switch: allow modules.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   109
     */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   110
    boolean allowModules;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   111
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
   112
   /** 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
   113
     */
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   114
    boolean lintClassfile;
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   115
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   116
    /** Switch: preserve parameter names from the variable table.
06bc494ca11e Initial load
duke
parents:
diff changeset
   117
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   118
    public boolean saveParameterNames;
06bc494ca11e Initial load
duke
parents:
diff changeset
   119
06bc494ca11e Initial load
duke
parents:
diff changeset
   120
    /**
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   121
     * The currently selected profile.
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   122
     */
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   123
    public final Profile profile;
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   124
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   125
    /** The log to use for verbose output
06bc494ca11e Initial load
duke
parents:
diff changeset
   126
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   127
    final Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
   128
06bc494ca11e Initial load
duke
parents:
diff changeset
   129
    /** The symbol table. */
06bc494ca11e Initial load
duke
parents:
diff changeset
   130
    Symtab syms;
06bc494ca11e Initial load
duke
parents:
diff changeset
   131
06bc494ca11e Initial load
duke
parents:
diff changeset
   132
    Types types;
06bc494ca11e Initial load
duke
parents:
diff changeset
   133
06bc494ca11e Initial load
duke
parents:
diff changeset
   134
    /** The name table. */
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 939
diff changeset
   135
    final Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   136
06bc494ca11e Initial load
duke
parents:
diff changeset
   137
    /** Access to files
06bc494ca11e Initial load
duke
parents:
diff changeset
   138
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   139
    private final JavaFileManager fileManager;
06bc494ca11e Initial load
duke
parents:
diff changeset
   140
169
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   141
    /** Factory for diagnostics
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   142
     */
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   143
    JCDiagnostic.Factory diagFactory;
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   144
49197
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
   145
    DeferredCompletionFailureHandler dcfh;
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
   146
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
   147
    /**
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
   148
     * Support for preview language features.
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
   149
     */
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
   150
    Preview preview;
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
   151
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   152
    /** The current scope where type variables are entered.
06bc494ca11e Initial load
duke
parents:
diff changeset
   153
     */
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
   154
    protected WriteableScope typevars;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   155
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   156
    private List<InterimUsesDirective> interimUses = List.nil();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   157
    private List<InterimProvidesDirective> interimProvides = List.nil();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   158
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   159
    /** The path name of the class file currently being read.
06bc494ca11e Initial load
duke
parents:
diff changeset
   160
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   161
    protected JavaFileObject currentClassFile = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   162
06bc494ca11e Initial load
duke
parents:
diff changeset
   163
    /** The class or method currently being read.
06bc494ca11e Initial load
duke
parents:
diff changeset
   164
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   165
    protected Symbol currentOwner = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   166
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   167
    /** The module containing the class currently being read.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   168
     */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   169
    protected ModuleSymbol currentModule = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   170
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   171
    /** The buffer containing the currently read class file.
06bc494ca11e Initial load
duke
parents:
diff changeset
   172
     */
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
   173
    byte[] buf = new byte[INITIAL_BUFFER_SIZE];
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   174
06bc494ca11e Initial load
duke
parents:
diff changeset
   175
    /** The current input pointer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   176
     */
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
   177
    protected int bp;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   178
06bc494ca11e Initial load
duke
parents:
diff changeset
   179
    /** The objects of the constant pool.
06bc494ca11e Initial load
duke
parents:
diff changeset
   180
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   181
    Object[] poolObj;
06bc494ca11e Initial load
duke
parents:
diff changeset
   182
06bc494ca11e Initial load
duke
parents:
diff changeset
   183
    /** For every constant pool entry, an index into buf where the
06bc494ca11e Initial load
duke
parents:
diff changeset
   184
     *  defining section of the entry is found.
06bc494ca11e Initial load
duke
parents:
diff changeset
   185
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   186
    int[] poolIdx;
06bc494ca11e Initial load
duke
parents:
diff changeset
   187
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   188
    /** The major version number of the class file being read. */
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   189
    int majorVersion;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   190
    /** The minor version number of the class file being read. */
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   191
    int minorVersion;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   192
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   193
    /** 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
   194
     * 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
   195
     */
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   196
    int[] parameterNameIndices;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   197
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   198
    /**
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   199
     * A table to hold annotations for method parameters.
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   200
     */
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   201
    ParameterAnnotations[] parameterAnnotations;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   202
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   203
    /**
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   204
     * A holder for parameter annotations.
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   205
     */
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   206
    static class ParameterAnnotations {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   207
        List<CompoundAnnotationProxy> proxies;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   208
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   209
        void add(List<CompoundAnnotationProxy> newAnnotations) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   210
            if (proxies == null) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   211
                proxies = newAnnotations;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   212
            } else {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   213
                proxies = proxies.prependList(newAnnotations);
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   214
            }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   215
        }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   216
    }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   217
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
   218
    /**
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   219
     * 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
   220
     */
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   221
    boolean haveParameterNameIndices;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
   222
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   223
    /** Set this to false every time we start reading a method
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   224
     * 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
   225
     * MethodParameters, if it's set when we see a LocalVariableTable,
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   226
     * then we ignore the parameter names from the LVT.
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   227
     */
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   228
    boolean sawMethodParameters;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
   229
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   230
    /**
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   231
     * 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
   232
     */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
   233
    Set<Name> warnedAttrs = new HashSet<>();
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   234
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   235
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   236
     * The prototype @Target Attribute.Compound if this class is an annotation annotated with
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   237
     * @Target
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   238
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   239
    CompoundAnnotationProxy target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   240
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   241
    /**
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   242
     * The prototype @Repetable Attribute.Compound if this class is an annotation annotated with
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   243
     * @Repeatable
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   244
     */
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   245
    CompoundAnnotationProxy repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   246
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   247
    /** Get the ClassReader instance for this invocation. */
06bc494ca11e Initial load
duke
parents:
diff changeset
   248
    public static ClassReader instance(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   249
        ClassReader instance = context.get(classReaderKey);
06bc494ca11e Initial load
duke
parents:
diff changeset
   250
        if (instance == null)
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   251
            instance = new ClassReader(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   252
        return instance;
06bc494ca11e Initial load
duke
parents:
diff changeset
   253
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   254
22442
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   255
    /** Construct a new class reader. */
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   256
    protected ClassReader(Context context) {
8fd30fc4e3a3 8029690: Move symbol creation from ClassReader to Symtab
jfranck
parents: 22167
diff changeset
   257
        context.put(classReaderKey, this);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
   258
        annotate = Annotate.instance(context);
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 939
diff changeset
   259
        names = Names.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   260
        syms = Symtab.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
        types = Types.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   262
        fileManager = context.get(JavaFileManager.class);
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
        if (fileManager == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   264
            throw new AssertionError("FileManager initialization error");
169
ff76730e430e 6668794: javac puts localized text in raw diagnostics
jjg
parents: 10
diff changeset
   265
        diagFactory = JCDiagnostic.Factory.instance(context);
49197
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
   266
        dcfh = DeferredCompletionFailureHandler.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   267
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
        log = Log.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
06bc494ca11e Initial load
duke
parents:
diff changeset
   270
        Options options = Options.instance(context);
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39587
diff changeset
   271
        verbose         = options.isSet(Option.VERBOSE);
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   272
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   273
        Source source = Source.instance(context);
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
   274
        preview = Preview.instance(context);
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47703
diff changeset
   275
        allowModules     = Feature.MODULES.allowedInSource(source);
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   276
39587
76c453568ffa 8160891: javac, remove unused options, step 3
vromero
parents: 39361
diff changeset
   277
        saveParameterNames = options.isSet(PARAMETERS);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   278
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   279
        profile = Profile.instance(context);
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 15031
diff changeset
   280
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
   281
        typevars = WriteableScope.create(syms.noSymbol);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   282
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
   283
        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
   284
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   285
        initAttributeReaders();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
    /** Add member to class unless it is synthetic.
06bc494ca11e Initial load
duke
parents:
diff changeset
   289
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   290
    private void enterMember(ClassSymbol c, Symbol sym) {
16300
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15718
diff changeset
   291
        // Synthetic members are not entered -- reason lost to history (optimization?).
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15718
diff changeset
   292
        // Lambda methods must be entered because they may have inner classes (which reference them)
7cf27559c8df 8004969: Generate $deserializeLambda$ method
rfield
parents: 15718
diff changeset
   293
        if ((sym.flags_field & (SYNTHETIC|BRIDGE)) != SYNTHETIC || sym.name.startsWith(names.lambda))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   294
            c.members_field.enter(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   295
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   296
06bc494ca11e Initial load
duke
parents:
diff changeset
   297
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   298
 * Error Diagnoses
06bc494ca11e Initial load
duke
parents:
diff changeset
   299
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   300
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
   301
    public ClassFinder.BadClassFile badClassFile(String key, Object... args) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
   302
        return new ClassFinder.BadClassFile (
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   303
            currentOwner.enclClass(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   304
            currentClassFile,
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
   305
            diagFactory.fragment(key, args),
49197
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
   306
            diagFactory,
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
   307
            dcfh);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   308
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   309
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
   310
    public ClassFinder.BadEnclosingMethodAttr badEnclosingMethod(Symbol sym) {
37001
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   311
        return new ClassFinder.BadEnclosingMethodAttr (
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   312
            currentOwner.enclClass(),
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   313
            currentClassFile,
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
   314
            diagFactory.fragment(Fragments.BadEnclosingMethod(sym)),
49197
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
   315
            diagFactory,
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
   316
            dcfh);
37001
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   317
    }
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   318
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   319
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   320
 * Buffer Access
06bc494ca11e Initial load
duke
parents:
diff changeset
   321
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   322
06bc494ca11e Initial load
duke
parents:
diff changeset
   323
    /** Read a character.
06bc494ca11e Initial load
duke
parents:
diff changeset
   324
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   325
    char nextChar() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   326
        return (char)(((buf[bp++] & 0xFF) << 8) + (buf[bp++] & 0xFF));
06bc494ca11e Initial load
duke
parents:
diff changeset
   327
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   328
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   329
    /** Read a byte.
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   330
     */
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
   331
    int nextByte() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
   332
        return buf[bp++] & 0xFF;
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   333
    }
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
   334
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
    /** Read an integer.
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
    int nextInt() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   338
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
   339
            ((buf[bp++] & 0xFF) << 24) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   340
            ((buf[bp++] & 0xFF) << 16) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   341
            ((buf[bp++] & 0xFF) << 8) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   342
            (buf[bp++] & 0xFF);
06bc494ca11e Initial load
duke
parents:
diff changeset
   343
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   344
06bc494ca11e Initial load
duke
parents:
diff changeset
   345
    /** Extract a character at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   346
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   347
    char getChar(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   348
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
   349
            (char)(((buf[bp] & 0xFF) << 8) + (buf[bp+1] & 0xFF));
06bc494ca11e Initial load
duke
parents:
diff changeset
   350
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   351
06bc494ca11e Initial load
duke
parents:
diff changeset
   352
    /** Extract an integer at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   353
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   354
    int getInt(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   355
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
            ((buf[bp] & 0xFF) << 24) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
            ((buf[bp+1] & 0xFF) << 16) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   358
            ((buf[bp+2] & 0xFF) << 8) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   359
            (buf[bp+3] & 0xFF);
06bc494ca11e Initial load
duke
parents:
diff changeset
   360
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   361
06bc494ca11e Initial load
duke
parents:
diff changeset
   362
06bc494ca11e Initial load
duke
parents:
diff changeset
   363
    /** Extract a long integer at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   364
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
    long getLong(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
        DataInputStream bufin =
06bc494ca11e Initial load
duke
parents:
diff changeset
   367
            new DataInputStream(new ByteArrayInputStream(buf, bp, 8));
06bc494ca11e Initial load
duke
parents:
diff changeset
   368
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   369
            return bufin.readLong();
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
        } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   371
            throw new AssertionError(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   373
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
    /** Extract a float at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   376
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
    float getFloat(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   378
        DataInputStream bufin =
06bc494ca11e Initial load
duke
parents:
diff changeset
   379
            new DataInputStream(new ByteArrayInputStream(buf, bp, 4));
06bc494ca11e Initial load
duke
parents:
diff changeset
   380
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
            return bufin.readFloat();
06bc494ca11e Initial load
duke
parents:
diff changeset
   382
        } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   383
            throw new AssertionError(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   384
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
    /** Extract a double at position bp from buf.
06bc494ca11e Initial load
duke
parents:
diff changeset
   388
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   389
    double getDouble(int bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
        DataInputStream bufin =
06bc494ca11e Initial load
duke
parents:
diff changeset
   391
            new DataInputStream(new ByteArrayInputStream(buf, bp, 8));
06bc494ca11e Initial load
duke
parents:
diff changeset
   392
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   393
            return bufin.readDouble();
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
        } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   395
            throw new AssertionError(e);
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   397
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   398
06bc494ca11e Initial load
duke
parents:
diff changeset
   399
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   400
 * Constant Pool Access
06bc494ca11e Initial load
duke
parents:
diff changeset
   401
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   402
06bc494ca11e Initial load
duke
parents:
diff changeset
   403
    /** Index all constant pool entries, writing their start addresses into
06bc494ca11e Initial load
duke
parents:
diff changeset
   404
     *  poolIdx.
06bc494ca11e Initial load
duke
parents:
diff changeset
   405
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   406
    void indexPool() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   407
        poolIdx = new int[nextChar()];
06bc494ca11e Initial load
duke
parents:
diff changeset
   408
        poolObj = new Object[poolIdx.length];
06bc494ca11e Initial load
duke
parents:
diff changeset
   409
        int i = 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
   410
        while (i < poolIdx.length) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   411
            poolIdx[i++] = bp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   412
            byte tag = buf[bp++];
06bc494ca11e Initial load
duke
parents:
diff changeset
   413
            switch (tag) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   414
            case CONSTANT_Utf8: case CONSTANT_Unicode: {
06bc494ca11e Initial load
duke
parents:
diff changeset
   415
                int len = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
   416
                bp = bp + len;
06bc494ca11e Initial load
duke
parents:
diff changeset
   417
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   418
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   419
            case CONSTANT_Class:
06bc494ca11e Initial load
duke
parents:
diff changeset
   420
            case CONSTANT_String:
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   421
            case CONSTANT_MethodType:
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   422
            case CONSTANT_Module:
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   423
            case CONSTANT_Package:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   424
                bp = bp + 2;
06bc494ca11e Initial load
duke
parents:
diff changeset
   425
                break;
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   426
            case CONSTANT_MethodHandle:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   427
                bp = bp + 3;
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   428
                break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   429
            case CONSTANT_Fieldref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   430
            case CONSTANT_Methodref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   431
            case CONSTANT_InterfaceMethodref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   432
            case CONSTANT_NameandType:
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
            case CONSTANT_Integer:
06bc494ca11e Initial load
duke
parents:
diff changeset
   434
            case CONSTANT_Float:
48826
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48430
diff changeset
   435
            case CONSTANT_Dynamic:
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   436
            case CONSTANT_InvokeDynamic:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   437
                bp = bp + 4;
06bc494ca11e Initial load
duke
parents:
diff changeset
   438
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   439
            case CONSTANT_Long:
06bc494ca11e Initial load
duke
parents:
diff changeset
   440
            case CONSTANT_Double:
06bc494ca11e Initial load
duke
parents:
diff changeset
   441
                bp = bp + 8;
06bc494ca11e Initial load
duke
parents:
diff changeset
   442
                i++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   443
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   444
            default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   445
                throw badClassFile("bad.const.pool.tag.at",
06bc494ca11e Initial load
duke
parents:
diff changeset
   446
                                   Byte.toString(tag),
06bc494ca11e Initial load
duke
parents:
diff changeset
   447
                                   Integer.toString(bp -1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   448
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   449
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   450
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   451
06bc494ca11e Initial load
duke
parents:
diff changeset
   452
    /** Read constant pool entry at start address i, use pool as a cache.
06bc494ca11e Initial load
duke
parents:
diff changeset
   453
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   454
    Object readPool(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   455
        Object result = poolObj[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   456
        if (result != null) return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
   457
06bc494ca11e Initial load
duke
parents:
diff changeset
   458
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   459
        if (index == 0) return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   460
06bc494ca11e Initial load
duke
parents:
diff changeset
   461
        byte tag = buf[index];
06bc494ca11e Initial load
duke
parents:
diff changeset
   462
        switch (tag) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   463
        case CONSTANT_Utf8:
06bc494ca11e Initial load
duke
parents:
diff changeset
   464
            poolObj[i] = names.fromUtf(buf, index + 3, getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   465
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   466
        case CONSTANT_Unicode:
06bc494ca11e Initial load
duke
parents:
diff changeset
   467
            throw badClassFile("unicode.str.not.supported");
06bc494ca11e Initial load
duke
parents:
diff changeset
   468
        case CONSTANT_Class:
06bc494ca11e Initial load
duke
parents:
diff changeset
   469
            poolObj[i] = readClassOrType(getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   470
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   471
        case CONSTANT_String:
06bc494ca11e Initial load
duke
parents:
diff changeset
   472
            // FIXME: (footprint) do not use toString here
06bc494ca11e Initial load
duke
parents:
diff changeset
   473
            poolObj[i] = readName(getChar(index + 1)).toString();
06bc494ca11e Initial load
duke
parents:
diff changeset
   474
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   475
        case CONSTANT_Fieldref: {
06bc494ca11e Initial load
duke
parents:
diff changeset
   476
            ClassSymbol owner = readClassSymbol(getChar(index + 1));
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   477
            NameAndType nt = readNameAndType(getChar(index + 3));
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
   478
            poolObj[i] = new VarSymbol(0, nt.name, nt.uniqueType.type, owner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   479
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   480
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   481
        case CONSTANT_Methodref:
06bc494ca11e Initial load
duke
parents:
diff changeset
   482
        case CONSTANT_InterfaceMethodref: {
06bc494ca11e Initial load
duke
parents:
diff changeset
   483
            ClassSymbol owner = readClassSymbol(getChar(index + 1));
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   484
            NameAndType nt = readNameAndType(getChar(index + 3));
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
   485
            poolObj[i] = new MethodSymbol(0, nt.name, nt.uniqueType.type, owner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   486
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   487
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   488
        case CONSTANT_NameandType:
06bc494ca11e Initial load
duke
parents:
diff changeset
   489
            poolObj[i] = new NameAndType(
06bc494ca11e Initial load
duke
parents:
diff changeset
   490
                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
   491
                readType(getChar(index + 3)), types);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   492
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   493
        case CONSTANT_Integer:
06bc494ca11e Initial load
duke
parents:
diff changeset
   494
            poolObj[i] = getInt(index + 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   496
        case CONSTANT_Float:
37635
9834489579e5 8145468: update java.lang APIs with new deprecations
smarks
parents: 37001
diff changeset
   497
            poolObj[i] = Float.valueOf(getFloat(index + 1));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   498
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   499
        case CONSTANT_Long:
37635
9834489579e5 8145468: update java.lang APIs with new deprecations
smarks
parents: 37001
diff changeset
   500
            poolObj[i] = Long.valueOf(getLong(index + 1));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   501
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   502
        case CONSTANT_Double:
37635
9834489579e5 8145468: update java.lang APIs with new deprecations
smarks
parents: 37001
diff changeset
   503
            poolObj[i] = Double.valueOf(getDouble(index + 1));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   504
            break;
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   505
        case CONSTANT_MethodHandle:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   506
            skipBytes(4);
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   507
            break;
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   508
        case CONSTANT_MethodType:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   509
            skipBytes(3);
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   510
            break;
48826
c4d9d1b08e2e 8186209: Tool support for ConstantDynamic
psandoz
parents: 48430
diff changeset
   511
        case CONSTANT_Dynamic:
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   512
        case CONSTANT_InvokeDynamic:
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   513
            skipBytes(5);
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
   514
            break;
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   515
        case CONSTANT_Module:
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   516
        case CONSTANT_Package:
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   517
            // this is temporary for now: treat as a simple reference to the underlying Utf8.
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   518
            poolObj[i] = readName(getChar(index + 1));
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   519
            break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   520
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
            throw badClassFile("bad.const.pool.tag", Byte.toString(tag));
06bc494ca11e Initial load
duke
parents:
diff changeset
   522
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
        return poolObj[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   524
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   525
06bc494ca11e Initial load
duke
parents:
diff changeset
   526
    /** Read signature and convert to type.
06bc494ca11e Initial load
duke
parents:
diff changeset
   527
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   528
    Type readType(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   529
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   530
        return sigToType(buf, index + 3, getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   531
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   532
06bc494ca11e Initial load
duke
parents:
diff changeset
   533
    /** If name is an array type or class signature, return the
06bc494ca11e Initial load
duke
parents:
diff changeset
   534
     *  corresponding type; otherwise return a ClassSymbol with given name.
06bc494ca11e Initial load
duke
parents:
diff changeset
   535
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   536
    Object readClassOrType(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   537
        int index =  poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   538
        int len = getChar(index + 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
   539
        int start = index + 3;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
   540
        Assert.check(buf[start] == '[' || buf[start + len - 1] != ';');
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   541
        // by the above assertion, the following test can be
06bc494ca11e Initial load
duke
parents:
diff changeset
   542
        // simplified to (buf[start] == '[')
06bc494ca11e Initial load
duke
parents:
diff changeset
   543
        return (buf[start] == '[' || buf[start + len - 1] == ';')
06bc494ca11e Initial load
duke
parents:
diff changeset
   544
            ? (Object)sigToType(buf, start, len)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   545
            : (Object)enterClass(names.fromUtf(internalize(buf, start,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   546
                                                           len)));
06bc494ca11e Initial load
duke
parents:
diff changeset
   547
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
    /** Read signature and convert to type parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   551
    List<Type> readTypeParams(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   552
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
   553
        return sigToTypeParams(buf, index + 3, getChar(index + 1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   555
06bc494ca11e Initial load
duke
parents:
diff changeset
   556
    /** Read class entry.
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   558
    ClassSymbol readClassSymbol(int i) {
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   559
        Object obj = readPool(i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   560
        if (obj != null && !(obj instanceof ClassSymbol))
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   561
            throw badClassFile("bad.const.pool.entry",
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   562
                               currentClassFile.toString(),
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   563
                               "CONSTANT_Class_info", i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   564
        return (ClassSymbol)obj;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   565
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   566
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   567
    Name readClassName(int i) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   568
        int index = poolIdx[i];
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   569
        if (index == 0) return null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   570
        byte tag = buf[index];
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   571
        if (tag != CONSTANT_Class) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   572
            throw badClassFile("bad.const.pool.entry",
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   573
                               currentClassFile.toString(),
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   574
                               "CONSTANT_Class_info", i);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   575
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   576
        int nameIndex =  poolIdx[getChar(index + 1)];
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   577
        int len = getChar(nameIndex + 1);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   578
        int start = nameIndex + 3;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   579
        if (buf[start] == '[' || buf[start + len - 1] == ';')
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   580
            throw badClassFile("wrong class name"); //TODO: proper diagnostics
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   581
        return names.fromUtf(internalize(buf, start, len));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   582
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   583
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   584
    /** Read name.
06bc494ca11e Initial load
duke
parents:
diff changeset
   585
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   586
    Name readName(int i) {
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   587
        Object obj = readPool(i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   588
        if (obj != null && !(obj instanceof Name))
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   589
            throw badClassFile("bad.const.pool.entry",
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   590
                               currentClassFile.toString(),
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   591
                               "CONSTANT_Utf8_info or CONSTANT_String_info", i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   592
        return (Name)obj;
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   593
    }
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   594
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   595
    /** Read name and type.
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   596
     */
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   597
    NameAndType readNameAndType(int i) {
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   598
        Object obj = readPool(i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   599
        if (obj != null && !(obj instanceof NameAndType))
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   600
            throw badClassFile("bad.const.pool.entry",
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   601
                               currentClassFile.toString(),
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   602
                               "CONSTANT_NameAndType_info", i);
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
   603
        return (NameAndType)obj;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   604
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   605
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   606
    /** Read the name of a module.
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   607
     * The name is stored in a CONSTANT_Module entry, in
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   608
     * JVMS 4.2 binary form (using ".", not "/")
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   609
     */
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   610
    Name readModuleName(int i) {
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   611
        return readName(i);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   612
    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   613
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   614
    /** Read module_flags.
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   615
     */
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   616
    Set<ModuleFlags> readModuleFlags(int flags) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   617
        Set<ModuleFlags> set = EnumSet.noneOf(ModuleFlags.class);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   618
        for (ModuleFlags f : ModuleFlags.values()) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   619
            if ((flags & f.value) != 0)
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   620
                set.add(f);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   621
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   622
        return set;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   623
    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   624
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   625
    /** Read resolution_flags.
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   626
     */
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   627
    Set<ModuleResolutionFlags> readModuleResolutionFlags(int flags) {
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   628
        Set<ModuleResolutionFlags> set = EnumSet.noneOf(ModuleResolutionFlags.class);
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   629
        for (ModuleResolutionFlags f : ModuleResolutionFlags.values()) {
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   630
            if ((flags & f.value) != 0)
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   631
                set.add(f);
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   632
        }
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   633
        return set;
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   634
    }
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
   635
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   636
    /** Read exports_flags.
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   637
     */
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   638
    Set<ExportsFlag> readExportsFlags(int flags) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   639
        Set<ExportsFlag> set = EnumSet.noneOf(ExportsFlag.class);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   640
        for (ExportsFlag f: ExportsFlag.values()) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   641
            if ((flags & f.value) != 0)
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   642
                set.add(f);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   643
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   644
        return set;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   645
    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   646
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   647
    /** Read opens_flags.
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   648
     */
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   649
    Set<OpensFlag> readOpensFlags(int flags) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   650
        Set<OpensFlag> set = EnumSet.noneOf(OpensFlag.class);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   651
        for (OpensFlag f: OpensFlag.values()) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   652
            if ((flags & f.value) != 0)
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   653
                set.add(f);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   654
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   655
        return set;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   656
    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
   657
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   658
    /** Read requires_flags.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   659
     */
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   660
    Set<RequiresFlag> readRequiresFlags(int flags) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   661
        Set<RequiresFlag> set = EnumSet.noneOf(RequiresFlag.class);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   662
        for (RequiresFlag f: RequiresFlag.values()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   663
            if ((flags & f.value) != 0)
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   664
                set.add(f);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   665
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   666
        return set;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   667
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   668
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   669
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   670
 * Reading Types
06bc494ca11e Initial load
duke
parents:
diff changeset
   671
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   672
06bc494ca11e Initial load
duke
parents:
diff changeset
   673
    /** The unread portion of the currently read type is
06bc494ca11e Initial load
duke
parents:
diff changeset
   674
     *  signature[sigp..siglimit-1].
06bc494ca11e Initial load
duke
parents:
diff changeset
   675
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   676
    byte[] signature;
06bc494ca11e Initial load
duke
parents:
diff changeset
   677
    int sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   678
    int siglimit;
06bc494ca11e Initial load
duke
parents:
diff changeset
   679
    boolean sigEnterPhase = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   680
06bc494ca11e Initial load
duke
parents:
diff changeset
   681
    /** Convert signature to type, where signature is a byte array segment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   682
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   683
    Type sigToType(byte[] sig, int offset, int len) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   684
        signature = sig;
06bc494ca11e Initial load
duke
parents:
diff changeset
   685
        sigp = offset;
06bc494ca11e Initial load
duke
parents:
diff changeset
   686
        siglimit = offset + len;
06bc494ca11e Initial load
duke
parents:
diff changeset
   687
        return sigToType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   688
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   689
06bc494ca11e Initial load
duke
parents:
diff changeset
   690
    /** Convert signature to type, where signature is implicit.
06bc494ca11e Initial load
duke
parents:
diff changeset
   691
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   692
    Type sigToType() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   693
        switch ((char) signature[sigp]) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   694
        case 'T':
06bc494ca11e Initial load
duke
parents:
diff changeset
   695
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   696
            int start = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   697
            while (signature[sigp] != ';') sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   698
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   699
            return sigEnterPhase
06bc494ca11e Initial load
duke
parents:
diff changeset
   700
                ? Type.noType
06bc494ca11e Initial load
duke
parents:
diff changeset
   701
                : findTypeVar(names.fromUtf(signature, start, sigp - 1 - start));
06bc494ca11e Initial load
duke
parents:
diff changeset
   702
        case '+': {
06bc494ca11e Initial load
duke
parents:
diff changeset
   703
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   704
            Type t = sigToType();
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   705
            return new WildcardType(t, BoundKind.EXTENDS, syms.boundClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   706
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   707
        case '*':
06bc494ca11e Initial load
duke
parents:
diff changeset
   708
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   709
            return new WildcardType(syms.objectType, BoundKind.UNBOUND,
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   710
                                    syms.boundClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   711
        case '-': {
06bc494ca11e Initial load
duke
parents:
diff changeset
   712
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   713
            Type t = sigToType();
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   714
            return new WildcardType(t, BoundKind.SUPER, syms.boundClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   715
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   716
        case 'B':
06bc494ca11e Initial load
duke
parents:
diff changeset
   717
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   718
            return syms.byteType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   719
        case 'C':
06bc494ca11e Initial load
duke
parents:
diff changeset
   720
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   721
            return syms.charType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   722
        case 'D':
06bc494ca11e Initial load
duke
parents:
diff changeset
   723
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   724
            return syms.doubleType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   725
        case 'F':
06bc494ca11e Initial load
duke
parents:
diff changeset
   726
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   727
            return syms.floatType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   728
        case 'I':
06bc494ca11e Initial load
duke
parents:
diff changeset
   729
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   730
            return syms.intType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   731
        case 'J':
06bc494ca11e Initial load
duke
parents:
diff changeset
   732
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   733
            return syms.longType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   734
        case 'L':
06bc494ca11e Initial load
duke
parents:
diff changeset
   735
            {
06bc494ca11e Initial load
duke
parents:
diff changeset
   736
                // int oldsigp = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   737
                Type t = classSigToType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   738
                if (sigp < siglimit && signature[sigp] == '.')
06bc494ca11e Initial load
duke
parents:
diff changeset
   739
                    throw badClassFile("deprecated inner class signature syntax " +
06bc494ca11e Initial load
duke
parents:
diff changeset
   740
                                       "(please recompile from source)");
06bc494ca11e Initial load
duke
parents:
diff changeset
   741
                /*
06bc494ca11e Initial load
duke
parents:
diff changeset
   742
                System.err.println(" decoded " +
06bc494ca11e Initial load
duke
parents:
diff changeset
   743
                                   new String(signature, oldsigp, sigp-oldsigp) +
06bc494ca11e Initial load
duke
parents:
diff changeset
   744
                                   " => " + t + " outer " + t.outer());
06bc494ca11e Initial load
duke
parents:
diff changeset
   745
                */
06bc494ca11e Initial load
duke
parents:
diff changeset
   746
                return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   747
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   748
        case 'S':
06bc494ca11e Initial load
duke
parents:
diff changeset
   749
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   750
            return syms.shortType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   751
        case 'V':
06bc494ca11e Initial load
duke
parents:
diff changeset
   752
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   753
            return syms.voidType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   754
        case 'Z':
06bc494ca11e Initial load
duke
parents:
diff changeset
   755
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   756
            return syms.booleanType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   757
        case '[':
06bc494ca11e Initial load
duke
parents:
diff changeset
   758
            sigp++;
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   759
            return new ArrayType(sigToType(), syms.arrayClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   760
        case '(':
06bc494ca11e Initial load
duke
parents:
diff changeset
   761
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   762
            List<Type> argtypes = sigToTypes(')');
06bc494ca11e Initial load
duke
parents:
diff changeset
   763
            Type restype = sigToType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   764
            List<Type> thrown = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
   765
            while (signature[sigp] == '^') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   766
                sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   767
                thrown = thrown.prepend(sigToType());
06bc494ca11e Initial load
duke
parents:
diff changeset
   768
            }
20242
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   769
            // if there is a typevar in the throws clause we should state it.
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   770
            for (List<Type> l = thrown; l.nonEmpty(); l = l.tail) {
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   771
                if (l.head.hasTag(TYPEVAR)) {
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   772
                    l.head.tsym.flags_field |= THROWS;
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   773
                }
11fa75a0b9fb 8024437: Inferring the exception thrown: sometimes fails to compile
vromero
parents: 19921
diff changeset
   774
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   775
            return new MethodType(argtypes,
06bc494ca11e Initial load
duke
parents:
diff changeset
   776
                                  restype,
06bc494ca11e Initial load
duke
parents:
diff changeset
   777
                                  thrown.reverse(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   778
                                  syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
   779
        case '<':
06bc494ca11e Initial load
duke
parents:
diff changeset
   780
            typevars = typevars.dup(currentOwner);
06bc494ca11e Initial load
duke
parents:
diff changeset
   781
            Type poly = new ForAll(sigToTypeParams(), sigToType());
06bc494ca11e Initial load
duke
parents:
diff changeset
   782
            typevars = typevars.leave();
06bc494ca11e Initial load
duke
parents:
diff changeset
   783
            return poly;
06bc494ca11e Initial load
duke
parents:
diff changeset
   784
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   785
            throw badClassFile("bad.signature",
06bc494ca11e Initial load
duke
parents:
diff changeset
   786
                               Convert.utf2string(signature, sigp, 10));
06bc494ca11e Initial load
duke
parents:
diff changeset
   787
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   788
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   789
06bc494ca11e Initial load
duke
parents:
diff changeset
   790
    byte[] signatureBuffer = new byte[0];
06bc494ca11e Initial load
duke
parents:
diff changeset
   791
    int sbp = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
   792
    /** Convert class signature to type, where signature is implicit.
06bc494ca11e Initial load
duke
parents:
diff changeset
   793
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   794
    Type classSigToType() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   795
        if (signature[sigp] != 'L')
06bc494ca11e Initial load
duke
parents:
diff changeset
   796
            throw badClassFile("bad.class.signature",
06bc494ca11e Initial load
duke
parents:
diff changeset
   797
                               Convert.utf2string(signature, sigp, 10));
06bc494ca11e Initial load
duke
parents:
diff changeset
   798
        sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   799
        Type outer = Type.noType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   800
        int startSbp = sbp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   801
06bc494ca11e Initial load
duke
parents:
diff changeset
   802
        while (true) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   803
            final byte c = signature[sigp++];
06bc494ca11e Initial load
duke
parents:
diff changeset
   804
            switch (c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   805
06bc494ca11e Initial load
duke
parents:
diff changeset
   806
            case ';': {         // end
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   807
                ClassSymbol t = enterClass(names.fromUtf(signatureBuffer,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   808
                                                         startSbp,
06bc494ca11e Initial load
duke
parents:
diff changeset
   809
                                                         sbp - startSbp));
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   810
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   811
                try {
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   812
                    return (outer == Type.noType) ?
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   813
                            t.erasure(types) :
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42822
diff changeset
   814
                        new ClassType(outer, List.nil(), t);
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   815
                } finally {
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   816
                    sbp = startSbp;
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   817
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   818
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   819
06bc494ca11e Initial load
duke
parents:
diff changeset
   820
            case '<':           // generic arguments
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   821
                ClassSymbol t = enterClass(names.fromUtf(signatureBuffer,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   822
                                                         startSbp,
06bc494ca11e Initial load
duke
parents:
diff changeset
   823
                                                         sbp - startSbp));
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   824
                outer = new ClassType(outer, sigToTypes('>'), t) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   825
                        boolean completed = false;
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
   826
                        @Override @DefinedBy(Api.LANGUAGE_MODEL)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   827
                        public Type getEnclosingType() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   828
                            if (!completed) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   829
                                completed = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   830
                                tsym.complete();
06bc494ca11e Initial load
duke
parents:
diff changeset
   831
                                Type enclosingType = tsym.type.getEnclosingType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   832
                                if (enclosingType != Type.noType) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   833
                                    List<Type> typeArgs =
06bc494ca11e Initial load
duke
parents:
diff changeset
   834
                                        super.getEnclosingType().allparams();
06bc494ca11e Initial load
duke
parents:
diff changeset
   835
                                    List<Type> typeParams =
06bc494ca11e Initial load
duke
parents:
diff changeset
   836
                                        enclosingType.allparams();
06bc494ca11e Initial load
duke
parents:
diff changeset
   837
                                    if (typeParams.length() != typeArgs.length()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   838
                                        // no "rare" types
06bc494ca11e Initial load
duke
parents:
diff changeset
   839
                                        super.setEnclosingType(types.erasure(enclosingType));
06bc494ca11e Initial load
duke
parents:
diff changeset
   840
                                    } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   841
                                        super.setEnclosingType(types.subst(enclosingType,
06bc494ca11e Initial load
duke
parents:
diff changeset
   842
                                                                           typeParams,
06bc494ca11e Initial load
duke
parents:
diff changeset
   843
                                                                           typeArgs));
06bc494ca11e Initial load
duke
parents:
diff changeset
   844
                                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   845
                                } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   846
                                    super.setEnclosingType(Type.noType);
06bc494ca11e Initial load
duke
parents:
diff changeset
   847
                                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   848
                            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   849
                            return super.getEnclosingType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   850
                        }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
   851
                        @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   852
                        public void setEnclosingType(Type outer) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   853
                            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
   854
                        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   855
                    };
06bc494ca11e Initial load
duke
parents:
diff changeset
   856
                switch (signature[sigp++]) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   857
                case ';':
06bc494ca11e Initial load
duke
parents:
diff changeset
   858
                    if (sigp < signature.length && signature[sigp] == '.') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   859
                        // support old-style GJC signatures
06bc494ca11e Initial load
duke
parents:
diff changeset
   860
                        // The signature produced was
06bc494ca11e Initial load
duke
parents:
diff changeset
   861
                        // Lfoo/Outer<Lfoo/X;>;.Lfoo/Outer$Inner<Lfoo/Y;>;
06bc494ca11e Initial load
duke
parents:
diff changeset
   862
                        // rather than say
06bc494ca11e Initial load
duke
parents:
diff changeset
   863
                        // Lfoo/Outer<Lfoo/X;>.Inner<Lfoo/Y;>;
06bc494ca11e Initial load
duke
parents:
diff changeset
   864
                        // so we skip past ".Lfoo/Outer$"
06bc494ca11e Initial load
duke
parents:
diff changeset
   865
                        sigp += (sbp - startSbp) + // "foo/Outer"
06bc494ca11e Initial load
duke
parents:
diff changeset
   866
                            3;  // ".L" and "$"
06bc494ca11e Initial load
duke
parents:
diff changeset
   867
                        signatureBuffer[sbp++] = (byte)'$';
06bc494ca11e Initial load
duke
parents:
diff changeset
   868
                        break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   869
                    } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   870
                        sbp = startSbp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   871
                        return outer;
06bc494ca11e Initial load
duke
parents:
diff changeset
   872
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   873
                case '.':
06bc494ca11e Initial load
duke
parents:
diff changeset
   874
                    signatureBuffer[sbp++] = (byte)'$';
06bc494ca11e Initial load
duke
parents:
diff changeset
   875
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   876
                default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   877
                    throw new AssertionError(signature[sigp-1]);
06bc494ca11e Initial load
duke
parents:
diff changeset
   878
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   879
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   880
06bc494ca11e Initial load
duke
parents:
diff changeset
   881
            case '.':
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   882
                //we have seen an enclosing non-generic class
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   883
                if (outer != Type.noType) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
   884
                    t = enterClass(names.fromUtf(signatureBuffer,
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   885
                                                 startSbp,
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   886
                                                 sbp - startSbp));
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42822
diff changeset
   887
                    outer = new ClassType(outer, List.nil(), t);
19915
8a6dae12e4bd 8022162: Incorrect signature determination for certain inner class generics
vromero
parents: 18389
diff changeset
   888
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   889
                signatureBuffer[sbp++] = (byte)'$';
06bc494ca11e Initial load
duke
parents:
diff changeset
   890
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   891
            case '/':
06bc494ca11e Initial load
duke
parents:
diff changeset
   892
                signatureBuffer[sbp++] = (byte)'.';
06bc494ca11e Initial load
duke
parents:
diff changeset
   893
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   894
            default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   895
                signatureBuffer[sbp++] = c;
06bc494ca11e Initial load
duke
parents:
diff changeset
   896
                continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   897
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   898
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   899
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   900
06bc494ca11e Initial load
duke
parents:
diff changeset
   901
    /** Convert (implicit) signature to list of types
06bc494ca11e Initial load
duke
parents:
diff changeset
   902
     *  until `terminator' is encountered.
06bc494ca11e Initial load
duke
parents:
diff changeset
   903
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   904
    List<Type> sigToTypes(char terminator) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   905
        List<Type> head = List.of(null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   906
        List<Type> tail = head;
06bc494ca11e Initial load
duke
parents:
diff changeset
   907
        while (signature[sigp] != terminator)
06bc494ca11e Initial load
duke
parents:
diff changeset
   908
            tail = tail.setTail(List.of(sigToType()));
06bc494ca11e Initial load
duke
parents:
diff changeset
   909
        sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   910
        return head.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   911
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   912
06bc494ca11e Initial load
duke
parents:
diff changeset
   913
    /** Convert signature to type parameters, where signature is a byte
06bc494ca11e Initial load
duke
parents:
diff changeset
   914
     *  array segment.
06bc494ca11e Initial load
duke
parents:
diff changeset
   915
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   916
    List<Type> sigToTypeParams(byte[] sig, int offset, int len) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   917
        signature = sig;
06bc494ca11e Initial load
duke
parents:
diff changeset
   918
        sigp = offset;
06bc494ca11e Initial load
duke
parents:
diff changeset
   919
        siglimit = offset + len;
06bc494ca11e Initial load
duke
parents:
diff changeset
   920
        return sigToTypeParams();
06bc494ca11e Initial load
duke
parents:
diff changeset
   921
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   922
06bc494ca11e Initial load
duke
parents:
diff changeset
   923
    /** Convert signature to type parameters, where signature is implicit.
06bc494ca11e Initial load
duke
parents:
diff changeset
   924
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   925
    List<Type> sigToTypeParams() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   926
        List<Type> tvars = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
   927
        if (signature[sigp] == '<') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   928
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   929
            int start = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   930
            sigEnterPhase = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
   931
            while (signature[sigp] != '>')
06bc494ca11e Initial load
duke
parents:
diff changeset
   932
                tvars = tvars.prepend(sigToTypeParam());
06bc494ca11e Initial load
duke
parents:
diff changeset
   933
            sigEnterPhase = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
   934
            sigp = start;
06bc494ca11e Initial load
duke
parents:
diff changeset
   935
            while (signature[sigp] != '>')
06bc494ca11e Initial load
duke
parents:
diff changeset
   936
                sigToTypeParam();
06bc494ca11e Initial load
duke
parents:
diff changeset
   937
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   938
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   939
        return tvars.reverse();
06bc494ca11e Initial load
duke
parents:
diff changeset
   940
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   941
06bc494ca11e Initial load
duke
parents:
diff changeset
   942
    /** Convert (implicit) signature to type parameter.
06bc494ca11e Initial load
duke
parents:
diff changeset
   943
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   944
    Type sigToTypeParam() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   945
        int start = sigp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   946
        while (signature[sigp] != ':') sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   947
        Name name = names.fromUtf(signature, start, sigp - start);
06bc494ca11e Initial load
duke
parents:
diff changeset
   948
        TypeVar tvar;
06bc494ca11e Initial load
duke
parents:
diff changeset
   949
        if (sigEnterPhase) {
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   950
            tvar = new TypeVar(name, currentOwner, syms.botType);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   951
            typevars.enter(tvar.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   952
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   953
            tvar = (TypeVar)findTypeVar(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   954
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   955
        List<Type> bounds = List.nil();
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14547
diff changeset
   956
        boolean allInterfaces = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   957
        if (signature[sigp] == ':' && signature[sigp+1] == ':') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   958
            sigp++;
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14547
diff changeset
   959
            allInterfaces = true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   960
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   961
        while (signature[sigp] == ':') {
06bc494ca11e Initial load
duke
parents:
diff changeset
   962
            sigp++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   963
            bounds = bounds.prepend(sigToType());
06bc494ca11e Initial load
duke
parents:
diff changeset
   964
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   965
        if (!sigEnterPhase) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14547
diff changeset
   966
            types.setBounds(tvar, bounds.reverse(), allInterfaces);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   967
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   968
        return tvar;
06bc494ca11e Initial load
duke
parents:
diff changeset
   969
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   970
06bc494ca11e Initial load
duke
parents:
diff changeset
   971
    /** Find type variable with given name in `typevars' scope.
06bc494ca11e Initial load
duke
parents:
diff changeset
   972
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   973
    Type findTypeVar(Name name) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
   974
        Symbol s = typevars.findFirst(name);
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
   975
        if (s != null) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
   976
            return s.type;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   977
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   978
            if (readingClassAttr) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   979
                // While reading the class attribute, the supertypes
06bc494ca11e Initial load
duke
parents:
diff changeset
   980
                // might refer to a type variable from an enclosing element
06bc494ca11e Initial load
duke
parents:
diff changeset
   981
                // (method or class).
06bc494ca11e Initial load
duke
parents:
diff changeset
   982
                // If the type variable is defined in the enclosing class,
06bc494ca11e Initial load
duke
parents:
diff changeset
   983
                // we can actually find it in
06bc494ca11e Initial load
duke
parents:
diff changeset
   984
                // currentOwner.owner.type.getTypeArguments()
06bc494ca11e Initial load
duke
parents:
diff changeset
   985
                // However, until we have read the enclosing method attribute
06bc494ca11e Initial load
duke
parents:
diff changeset
   986
                // we don't know for sure if this owner is correct.  It could
06bc494ca11e Initial load
duke
parents:
diff changeset
   987
                // be a method and there is no way to tell before reading the
06bc494ca11e Initial load
duke
parents:
diff changeset
   988
                // enclosing method attribute.
26781
a786b07c7b91 8048614: Add TypeMetadata to contain type annotations and other type information
emc
parents: 26532
diff changeset
   989
                TypeVar t = new TypeVar(name, currentOwner, syms.botType);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   990
                missingTypeVariables = missingTypeVariables.prepend(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
   991
                // System.err.println("Missing type var " + name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   992
                return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   993
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   994
            throw badClassFile("undecl.type.var", name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   995
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   996
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   997
06bc494ca11e Initial load
duke
parents:
diff changeset
   998
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   999
 * Reading Attributes
06bc494ca11e Initial load
duke
parents:
diff changeset
  1000
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1001
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1002
    protected enum AttributeKind { CLASS, MEMBER }
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1003
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1004
    protected abstract class AttributeReader {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1005
        protected AttributeReader(Name name, ClassFile.Version version, Set<AttributeKind> kinds) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1006
            this.name = name;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1007
            this.version = version;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1008
            this.kinds = kinds;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1009
        }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1010
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1011
        protected boolean accepts(AttributeKind kind) {
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1012
            if (kinds.contains(kind)) {
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1013
                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
  1014
                    return true;
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1015
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1016
                if (lintClassfile && !warnedAttrs.contains(name)) {
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1017
                    JavaFileObject prev = log.useSource(currentClassFile);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1018
                    try {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  1019
                        log.warning(LintCategory.CLASSFILE, (DiagnosticPosition) null,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  1020
                                    Warnings.FutureAttr(name, version.major, version.minor, majorVersion, minorVersion));
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1021
                    } finally {
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1022
                        log.useSource(prev);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1023
                    }
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1024
                    warnedAttrs.add(name);
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1025
                }
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1026
            }
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1027
            return false;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1028
        }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1029
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1030
        protected abstract void read(Symbol sym, int attrLen);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1031
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1032
        protected final Name name;
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1033
        protected final ClassFile.Version version;
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1034
        protected final Set<AttributeKind> kinds;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1035
    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1036
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1037
    protected Set<AttributeKind> CLASS_ATTRIBUTE =
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1038
            EnumSet.of(AttributeKind.CLASS);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1039
    protected Set<AttributeKind> MEMBER_ATTRIBUTE =
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1040
            EnumSet.of(AttributeKind.MEMBER);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1041
    protected Set<AttributeKind> CLASS_OR_MEMBER_ATTRIBUTE =
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1042
            EnumSet.of(AttributeKind.CLASS, AttributeKind.MEMBER);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1043
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1044
    protected Map<Name, AttributeReader> attributeReaders = new HashMap<>();
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1045
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  1046
    private void initAttributeReaders() {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1047
        AttributeReader[] readers = {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1048
            // v45.3 attributes
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1049
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1050
            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
  1051
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1052
                    if (readAllOfClassFile || saveParameterNames)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1053
                        ((MethodSymbol)sym).code = readCode(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1054
                    else
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1055
                        bp = bp + attrLen;
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
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1058
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1059
            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
  1060
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1061
                    Object v = readPool(nextChar());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1062
                    // Ignore ConstantValue attribute if field not final.
42973
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1063
                    if ((sym.flags() & FINAL) == 0) {
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1064
                        return;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1065
                    }
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1066
                    VarSymbol var = (VarSymbol) sym;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1067
                    switch (var.type.getTag()) {
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1068
                       case BOOLEAN:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1069
                       case BYTE:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1070
                       case CHAR:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1071
                       case SHORT:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1072
                       case INT:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1073
                           checkType(var, Integer.class, v);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1074
                           break;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1075
                       case LONG:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1076
                           checkType(var, Long.class, v);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1077
                           break;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1078
                       case FLOAT:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1079
                           checkType(var, Float.class, v);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1080
                           break;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1081
                       case DOUBLE:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1082
                           checkType(var, Double.class, v);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1083
                           break;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1084
                       case CLASS:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1085
                           Assert.check(var.type.tsym == syms.stringType.tsym);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1086
                           checkType(var, String.class, v);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1087
                           break;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1088
                       default:
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1089
                           // ignore ConstantValue attribute if type is not primitive or String
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1090
                           return;
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1091
                    }
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1092
                    if (v instanceof Integer && !var.type.getTag().checkRange((Integer) v)) {
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1093
                        throw badClassFile("bad.constant.range", v, var, var.type);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1094
                    }
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1095
                    var.setData(v);
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1096
                }
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1097
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1098
                void checkType(Symbol var, Class<?> clazz, Object value) {
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1099
                    if (!clazz.isInstance(value)) {
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1100
                        throw badClassFile("bad.constant.value", value, var, clazz.getSimpleName());
3795332b55c7 8171132: Improve class reading of invalid or out-of-range ConstantValue attributes
cushon
parents: 42828
diff changeset
  1101
                    }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1102
                }
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
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1105
            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
  1106
                protected void read(Symbol sym, int attrLen) {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1107
                    Symbol s = sym.owner.kind == MDL ? sym.owner : sym;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1108
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1109
                    s.flags_field |= DEPRECATED;
2513
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
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1113
            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
  1114
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1115
                    int nexceptions = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1116
                    List<Type> thrown = List.nil();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1117
                    for (int j = 0; j < nexceptions; j++)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1118
                        thrown = thrown.prepend(readClassSymbol(nextChar()).type);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1119
                    if (sym.type.getThrownTypes().isEmpty())
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1120
                        sym.type.asMethodType().thrown = thrown.reverse();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1121
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1122
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1123
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1124
            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
  1125
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1126
                    ClassSymbol c = (ClassSymbol) sym;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1127
                    if (currentModule.module_info == c) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1128
                        //prevent entering the classes too soon:
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1129
                        skipInnerClasses();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1130
                    } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1131
                        readInnerClasses(c);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1132
                    }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1133
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1134
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1135
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1136
            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
  1137
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1138
                    int newbp = bp + attrLen;
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  1139
                    if (saveParameterNames && !sawMethodParameters) {
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1140
                        // 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
  1141
                        // 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
  1142
                        // 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
  1143
                        // 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
  1144
                        // 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
  1145
                        // parameterNameIndicies array.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1146
                        // 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
  1147
                        // 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
  1148
                        // there is no specified ordering for the entries.
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1149
                        int numEntries = nextChar();
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1150
                        for (int i = 0; i < numEntries; i++) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1151
                            int start_pc = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1152
                            int length = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1153
                            int nameIndex = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1154
                            int sigIndex = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1155
                            int register = nextChar();
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1156
                            if (start_pc == 0) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1157
                                // ensure array large enough
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1158
                                if (register >= parameterNameIndices.length) {
39178
997c7bd366db 8136453: Parameter name indices array size not updated correctly
jlahoda
parents: 37635
diff changeset
  1159
                                    int newSize =
997c7bd366db 8136453: Parameter name indices array size not updated correctly
jlahoda
parents: 37635
diff changeset
  1160
                                            Math.max(register + 1, parameterNameIndices.length + 8);
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1161
                                    parameterNameIndices =
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1162
                                            Arrays.copyOf(parameterNameIndices, newSize);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1163
                                }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1164
                                parameterNameIndices[register] = nameIndex;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  1165
                                haveParameterNameIndices = true;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1166
                            }
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
                    bp = newbp;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1170
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1171
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1172
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1173
            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
  1174
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1175
                    ClassSymbol c = (ClassSymbol) sym;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1176
                    Name n = readName(nextChar());
54039
fd6c13481231 8220377: Unused field SourceFileObject.flatname
cushon
parents: 51833
diff changeset
  1177
                    c.sourcefile = new SourceFileObject(n);
14369
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1178
                    // 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
  1179
                    // 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
  1180
                    // an auxiliary class.
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1181
                    String sn = n.toString();
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 26781
diff changeset
  1182
                    if (c.owner.kind == PCK &&
14369
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1183
                        sn.endsWith(".java") &&
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1184
                        !sn.equals(c.name.toString()+".java")) {
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1185
                        c.flags_field |= AUXILIARY;
3d660d08d1f7 7153951: Add new lint option -Xlint:auxiliaryclass
ohrstrom
parents: 14359
diff changeset
  1186
                    }
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1187
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1188
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1189
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1190
            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
  1191
                protected void read(Symbol sym, int attrLen) {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25443
diff changeset
  1192
                    sym.flags_field |= SYNTHETIC;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1193
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1194
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1195
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1196
            // standard v49 attributes
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
            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
  1199
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1200
                    int newbp = bp + attrLen;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1201
                    readEnclosingMethodAttr(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1202
                    bp = newbp;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1203
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1204
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1205
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1206
            new AttributeReader(names.Signature, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1207
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1208
                    if (sym.kind == TYP) {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1209
                        ClassSymbol c = (ClassSymbol) sym;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1210
                        readingClassAttr = true;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1211
                        try {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1212
                            ClassType ct1 = (ClassType)c.type;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1213
                            Assert.check(c == currentOwner);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1214
                            ct1.typarams_field = readTypeParams(nextChar());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1215
                            ct1.supertype_field = sigToType();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1216
                            ListBuffer<Type> is = new ListBuffer<>();
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1217
                            while (sigp != siglimit) is.append(sigToType());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1218
                            ct1.interfaces_field = is.toList();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1219
                        } finally {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1220
                            readingClassAttr = false;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1221
                        }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1222
                    } else {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1223
                        List<Type> thrown = sym.type.getThrownTypes();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1224
                        sym.type = readType(nextChar());
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1225
                        //- System.err.println(" # " + sym.type);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1226
                        if (sym.kind == MTH && sym.type.getThrownTypes().isEmpty())
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1227
                            sym.type.asMethodType().thrown = thrown;
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
                    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1230
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1231
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1232
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1233
            // v49 annotation attributes
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1234
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1235
            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
  1236
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1237
                    attachAnnotationDefault(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1238
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1239
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1240
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1241
            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
  1242
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1243
                    attachAnnotations(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1244
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1245
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1246
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1247
            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
  1248
                protected void read(Symbol sym, int attrLen) {
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1249
                    readParameterAnnotations(sym);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1250
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1251
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1252
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1253
            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
  1254
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1255
                    attachAnnotations(sym);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1256
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1257
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1258
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1259
            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
  1260
                protected void read(Symbol sym, int attrLen) {
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1261
                    readParameterAnnotations(sym);
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1262
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1263
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1264
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1265
            // additional "legacy" v49 attributes, superceded by flags
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1266
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1267
            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
  1268
                protected void read(Symbol sym, int attrLen) {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25443
diff changeset
  1269
                    sym.flags_field |= ANNOTATION;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1270
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1271
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1272
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1273
            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
  1274
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1275
                    sym.flags_field |= BRIDGE;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1276
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1277
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1278
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1279
            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
  1280
                protected void read(Symbol sym, int attrLen) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1281
                    sym.flags_field |= ENUM;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1282
                }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1283
            },
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1284
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1285
            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
  1286
                protected void read(Symbol sym, int attrLen) {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25443
diff changeset
  1287
                    sym.flags_field |= VARARGS;
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1288
                }
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1289
            },
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  1290
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1291
            new AttributeReader(names.RuntimeVisibleTypeAnnotations, V52, CLASS_OR_MEMBER_ATTRIBUTE) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1292
                protected void read(Symbol sym, int attrLen) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1293
                    attachTypeAnnotations(sym);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1294
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1295
            },
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1296
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1297
            new AttributeReader(names.RuntimeInvisibleTypeAnnotations, V52, CLASS_OR_MEMBER_ATTRIBUTE) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1298
                protected void read(Symbol sym, int attrLen) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1299
                    attachTypeAnnotations(sym);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1300
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1301
            },
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1302
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1303
            // The following attributes for a Code attribute are not currently handled
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1304
            // StackMapTable
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1305
            // SourceDebugExtension
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1306
            // LineNumberTable
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1307
            // LocalVariableTypeTable
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1308
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1309
            // standard v52 attributes
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1310
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1311
            new AttributeReader(names.MethodParameters, V52, MEMBER_ATTRIBUTE) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1312
                protected void read(Symbol sym, int attrlen) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1313
                    int newbp = bp + attrlen;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1314
                    if (saveParameterNames) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1315
                        sawMethodParameters = true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1316
                        int numEntries = nextByte();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1317
                        parameterNameIndices = new int[numEntries];
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1318
                        haveParameterNameIndices = true;
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1319
                        int index = 0;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1320
                        for (int i = 0; i < numEntries; i++) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1321
                            int nameIndex = nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1322
                            int flags = nextChar();
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1323
                            if ((flags & (Flags.MANDATED | Flags.SYNTHETIC)) != 0) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1324
                                continue;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1325
                            }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1326
                            parameterNameIndices[index++] = nameIndex;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1327
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1328
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1329
                    bp = newbp;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1330
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1331
            },
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1332
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1333
            // standard v53 attributes
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1334
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1335
            new AttributeReader(names.Module, V53, CLASS_ATTRIBUTE) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1336
                @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1337
                protected boolean accepts(AttributeKind kind) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1338
                    return super.accepts(kind) && allowModules;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1339
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1340
                protected void read(Symbol sym, int attrLen) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1341
                    if (sym.kind == TYP && sym.owner.kind == MDL) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1342
                        ModuleSymbol msym = (ModuleSymbol) sym.owner;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1343
                        ListBuffer<Directive> directives = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1344
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  1345
                        Name moduleName = readModuleName(nextChar());
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  1346
                        if (currentModule.name != moduleName) {
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  1347
                            throw badClassFile("module.name.mismatch", moduleName, currentModule.name);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1348
                        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1349
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1350
                        Set<ModuleFlags> moduleFlags = readModuleFlags(nextChar());
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1351
                        msym.flags.addAll(moduleFlags);
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  1352
                        msym.version = readName(nextChar());
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1353
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1354
                        ListBuffer<RequiresDirective> requires = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1355
                        int nrequires = nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1356
                        for (int i = 0; i < nrequires; i++) {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1357
                            ModuleSymbol rsym = syms.enterModule(readModuleName(nextChar()));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1358
                            Set<RequiresFlag> flags = readRequiresFlags(nextChar());
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1359
                            if (rsym == syms.java_base && majorVersion >= V54.major) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1360
                                if (flags.contains(RequiresFlag.TRANSITIVE)) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1361
                                    throw badClassFile("bad.requires.flag", RequiresFlag.TRANSITIVE);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1362
                                }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1363
                                if (flags.contains(RequiresFlag.STATIC_PHASE)) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1364
                                    throw badClassFile("bad.requires.flag", RequiresFlag.STATIC_PHASE);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1365
                                }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents: 48081
diff changeset
  1366
                            }
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  1367
                            nextChar(); // skip compiled version
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1368
                            requires.add(new RequiresDirective(rsym, flags));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1369
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1370
                        msym.requires = requires.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1371
                        directives.addAll(msym.requires);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1372
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1373
                        ListBuffer<ExportsDirective> exports = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1374
                        int nexports = nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1375
                        for (int i = 0; i < nexports; i++) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1376
                            Name n = readName(nextChar());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1377
                            PackageSymbol p = syms.enterPackage(currentModule, names.fromUtf(internalize(n)));
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1378
                            Set<ExportsFlag> flags = readExportsFlags(nextChar());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1379
                            int nto = nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1380
                            List<ModuleSymbol> to;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1381
                            if (nto == 0) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1382
                                to = null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1383
                            } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1384
                                ListBuffer<ModuleSymbol> lb = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1385
                                for (int t = 0; t < nto; t++)
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1386
                                    lb.append(syms.enterModule(readModuleName(nextChar())));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1387
                                to = lb.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1388
                            }
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1389
                            exports.add(new ExportsDirective(p, to, flags));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1390
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1391
                        msym.exports = exports.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1392
                        directives.addAll(msym.exports);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1393
                        ListBuffer<OpensDirective> opens = new ListBuffer<>();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1394
                        int nopens = nextChar();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1395
                        if (nopens != 0 && msym.flags.contains(ModuleFlags.OPEN)) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1396
                            throw badClassFile("module.non.zero.opens", currentModule.name);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1397
                        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1398
                        for (int i = 0; i < nopens; i++) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1399
                            Name n = readName(nextChar());
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1400
                            PackageSymbol p = syms.enterPackage(currentModule, names.fromUtf(internalize(n)));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1401
                            Set<OpensFlag> flags = readOpensFlags(nextChar());
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1402
                            int nto = nextChar();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1403
                            List<ModuleSymbol> to;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1404
                            if (nto == 0) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1405
                                to = null;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1406
                            } else {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1407
                                ListBuffer<ModuleSymbol> lb = new ListBuffer<>();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1408
                                for (int t = 0; t < nto; t++)
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1409
                                    lb.append(syms.enterModule(readModuleName(nextChar())));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1410
                                to = lb.toList();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1411
                            }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1412
                            opens.add(new OpensDirective(p, to, flags));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1413
                        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1414
                        msym.opens = opens.toList();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1415
                        directives.addAll(msym.opens);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1416
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1417
                        msym.directives = directives.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1418
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1419
                        ListBuffer<InterimUsesDirective> uses = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1420
                        int nuses = nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1421
                        for (int i = 0; i < nuses; i++) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1422
                            Name srvc = readClassName(nextChar());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1423
                            uses.add(new InterimUsesDirective(srvc));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1424
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1425
                        interimUses = uses.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1426
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1427
                        ListBuffer<InterimProvidesDirective> provides = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1428
                        int nprovides = nextChar();
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1429
                        for (int p = 0; p < nprovides; p++) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1430
                            Name srvc = readClassName(nextChar());
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1431
                            int nimpls = nextChar();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1432
                            ListBuffer<Name> impls = new ListBuffer<>();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1433
                            for (int i = 0; i < nimpls; i++) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1434
                                impls.append(readClassName(nextChar()));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1435
                            provides.add(new InterimProvidesDirective(srvc, impls.toList()));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1436
                            }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1437
                        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1438
                        interimProvides = provides.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1439
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1440
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1441
            },
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1442
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  1443
            new AttributeReader(names.ModuleResolution, V53, CLASS_ATTRIBUTE) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1444
                @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1445
                protected boolean accepts(AttributeKind kind) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1446
                    return super.accepts(kind) && allowModules;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1447
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1448
                protected void read(Symbol sym, int attrLen) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1449
                    if (sym.kind == TYP && sym.owner.kind == MDL) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1450
                        ModuleSymbol msym = (ModuleSymbol) sym.owner;
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  1451
                        msym.resolutionFlags.addAll(readModuleResolutionFlags(nextChar()));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1452
                    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1453
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1454
            },
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1455
        };
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1456
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1457
        for (AttributeReader r: readers)
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1458
            attributeReaders.put(r.name, r);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1459
    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1460
13635
5c742eabba7c 7192068: (javac) provide a way for IDEs to produce Enclosing Method attributes.
ksrini
parents: 12335
diff changeset
  1461
    protected void readEnclosingMethodAttr(Symbol sym) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1462
        // sym is a nested class with an "Enclosing Method" attribute
06bc494ca11e Initial load
duke
parents:
diff changeset
  1463
        // remove sym from it's current owners scope and place it in
06bc494ca11e Initial load
duke
parents:
diff changeset
  1464
        // the scope specified by the attribute
06bc494ca11e Initial load
duke
parents:
diff changeset
  1465
        sym.owner.members().remove(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1466
        ClassSymbol self = (ClassSymbol)sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1467
        ClassSymbol c = readClassSymbol(nextChar());
24068
d8a1180faaa9 8038023: Compiler crash ClassCastException
pgovereau
parents: 23975
diff changeset
  1468
        NameAndType nt = readNameAndType(nextChar());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1469
45910
c7092e4591b2 8182450: javac aborts when generating ct.sym intermittently
jlahoda
parents: 45504
diff changeset
  1470
        if (c.members_field == null || c.kind != TYP)
9077
6ee59e40b258 7031108: NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build
jjg
parents: 8630
diff changeset
  1471
            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
  1472
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1473
        MethodSymbol m = findMethod(nt, c.members_field, self.flags());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1474
        if (nt != null && m == null)
37001
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
  1475
            throw badEnclosingMethod(self);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1476
06bc494ca11e Initial load
duke
parents:
diff changeset
  1477
        self.name = simpleBinaryName(self.flatname, c.flatname) ;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1478
        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
  1479
        if (self.name.isEmpty())
5012
405341b6e9c5 6449781: TypeElement.getQualifiedName for anonymous classes returns null instead of an empty name
darcy
parents: 4872
diff changeset
  1480
            self.fullname = names.empty;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1481
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1482
            self.fullname = ClassSymbol.formFullName(self.name, self.owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1483
06bc494ca11e Initial load
duke
parents:
diff changeset
  1484
        if (m != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1485
            ((ClassType)sym.type).setEnclosingType(m.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1486
        } else if ((self.flags_field & STATIC) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1487
            ((ClassType)sym.type).setEnclosingType(c.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1488
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1489
            ((ClassType)sym.type).setEnclosingType(Type.noType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1490
        }
41935
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  1491
        enterTypevars(self, self.type);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1492
        if (!missingTypeVariables.isEmpty()) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1493
            ListBuffer<Type> typeVars =  new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1494
            for (Type typevar : missingTypeVariables) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1495
                typeVars.append(findTypeVar(typevar.tsym.name));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1496
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1497
            foundTypeVariables = typeVars.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1498
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1499
            foundTypeVariables = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1500
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1501
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1502
06bc494ca11e Initial load
duke
parents:
diff changeset
  1503
    // See java.lang.Class
06bc494ca11e Initial load
duke
parents:
diff changeset
  1504
    private Name simpleBinaryName(Name self, Name enclosing) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1505
        String simpleBinaryName = self.toString().substring(enclosing.toString().length());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1506
        if (simpleBinaryName.length() < 1 || simpleBinaryName.charAt(0) != '$')
06bc494ca11e Initial load
duke
parents:
diff changeset
  1507
            throw badClassFile("bad.enclosing.method", self);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1508
        int index = 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1509
        while (index < simpleBinaryName.length() &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1510
               isAsciiDigit(simpleBinaryName.charAt(index)))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1511
            index++;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1512
        return names.fromString(simpleBinaryName.substring(index));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1513
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1514
06bc494ca11e Initial load
duke
parents:
diff changeset
  1515
    private MethodSymbol findMethod(NameAndType nt, Scope scope, long flags) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1516
        if (nt == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1517
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1518
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1519
        MethodType type = nt.uniqueType.type.asMethodType();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1520
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  1521
        for (Symbol sym : scope.getSymbolsByName(nt.name)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  1522
            if (sym.kind == MTH && isSameBinaryType(sym.type.asMethodType(), type))
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  1523
                return (MethodSymbol)sym;
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  1524
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1525
06bc494ca11e Initial load
duke
parents:
diff changeset
  1526
        if (nt.name != names.init)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1527
            // not a constructor
06bc494ca11e Initial load
duke
parents:
diff changeset
  1528
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1529
        if ((flags & INTERFACE) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1530
            // no enclosing instance
06bc494ca11e Initial load
duke
parents:
diff changeset
  1531
            return null;
14949
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1532
        if (nt.uniqueType.type.getParameterTypes().isEmpty())
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1533
            // no parameters
06bc494ca11e Initial load
duke
parents:
diff changeset
  1534
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1535
06bc494ca11e Initial load
duke
parents:
diff changeset
  1536
        // A constructor of an inner class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1537
        // 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
  1538
        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
  1539
                                 nt.uniqueType.type.getReturnType(),
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1540
                                 nt.uniqueType.type.getThrownTypes(),
45f43822bbde 8000518: Javac generates duplicate name_and_type constant pool entry for class BinaryOpValueExp.java
vromero
parents: 14804
diff changeset
  1541
                                 syms.methodClass));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1542
        // Try searching again
06bc494ca11e Initial load
duke
parents:
diff changeset
  1543
        return findMethod(nt, scope, flags);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1544
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1545
06bc494ca11e Initial load
duke
parents:
diff changeset
  1546
    /** Similar to Types.isSameType but avoids completion */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1547
    private boolean isSameBinaryType(MethodType mt1, MethodType mt2) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1548
        List<Type> types1 = types.erasure(mt1.getParameterTypes())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1549
            .prepend(types.erasure(mt1.getReturnType()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1550
        List<Type> types2 = mt2.getParameterTypes().prepend(mt2.getReturnType());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1551
        while (!types1.isEmpty() && !types2.isEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1552
            if (types1.head.tsym != types2.head.tsym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1553
                return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1554
            types1 = types1.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1555
            types2 = types2.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1556
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1557
        return types1.isEmpty() && types2.isEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1558
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1559
06bc494ca11e Initial load
duke
parents:
diff changeset
  1560
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  1561
     * Character.isDigit answers <tt>true</tt> to some non-ascii
06bc494ca11e Initial load
duke
parents:
diff changeset
  1562
     * digits.  This one does not.  <b>copied from java.lang.Class</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
  1563
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1564
    private static boolean isAsciiDigit(char c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1565
        return '0' <= c && c <= '9';
06bc494ca11e Initial load
duke
parents:
diff changeset
  1566
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1567
06bc494ca11e Initial load
duke
parents:
diff changeset
  1568
    /** Read member attributes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1569
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1570
    void readMemberAttrs(Symbol sym) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1571
        readAttrs(sym, AttributeKind.MEMBER);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1572
    }
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1573
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1574
    void readAttrs(Symbol sym, AttributeKind kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1575
        char ac = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1576
        for (int i = 0; i < ac; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1577
            Name attrName = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1578
            int attrLen = nextInt();
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1579
            AttributeReader r = attributeReaders.get(attrName);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1580
            if (r != null && r.accepts(kind))
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1581
                r.read(sym, attrLen);
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1582
            else  {
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1583
                bp = bp + attrLen;
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1584
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1585
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1586
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1587
06bc494ca11e Initial load
duke
parents:
diff changeset
  1588
    private boolean readingClassAttr = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1589
    private List<Type> missingTypeVariables = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1590
    private List<Type> foundTypeVariables = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1591
06bc494ca11e Initial load
duke
parents:
diff changeset
  1592
    /** Read class attributes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1593
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1594
    void readClassAttrs(ClassSymbol c) {
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  1595
        readAttrs(c, AttributeKind.CLASS);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1596
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1597
06bc494ca11e Initial load
duke
parents:
diff changeset
  1598
    /** Read code block.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1599
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1600
    Code readCode(Symbol owner) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1601
        nextChar(); // max_stack
06bc494ca11e Initial load
duke
parents:
diff changeset
  1602
        nextChar(); // max_locals
06bc494ca11e Initial load
duke
parents:
diff changeset
  1603
        final int  code_length = nextInt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1604
        bp += code_length;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1605
        final char exception_table_length = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1606
        bp += exception_table_length * 8;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1607
        readMemberAttrs(owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1608
        return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1609
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1610
06bc494ca11e Initial load
duke
parents:
diff changeset
  1611
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1612
 * Reading Java-language annotations
06bc494ca11e Initial load
duke
parents:
diff changeset
  1613
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1614
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1615
    /**
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1616
     * Save annotations.
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1617
     */
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1618
    List<CompoundAnnotationProxy> readAnnotations() {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1619
        int numAttributes = nextChar();
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1620
        ListBuffer<CompoundAnnotationProxy> annotations = new ListBuffer<>();
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1621
        for (int i = 0; i < numAttributes; i++) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1622
            annotations.append(readCompoundAnnotation());
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1623
        }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1624
        return annotations.toList();
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1625
    }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1626
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1627
    /** Attach annotations.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1628
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1629
    void attachAnnotations(final Symbol sym) {
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1630
        attachAnnotations(sym, readAnnotations());
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1631
    }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1632
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1633
    /**
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1634
     * Attach annotations.
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1635
     */
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1636
    void attachAnnotations(final Symbol sym, List<CompoundAnnotationProxy> annotations) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1637
        if (annotations.isEmpty()) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1638
            return;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1639
        }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1640
        ListBuffer<CompoundAnnotationProxy> proxies = new ListBuffer<>();
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1641
        for (CompoundAnnotationProxy proxy : annotations) {
51833
91fd24cf57d5 8209058: Cannot find annotation method 'value()' in type 'Profile+Annotation'
jlahoda
parents: 51719
diff changeset
  1642
            if (proxy.type.tsym.flatName() == syms.proprietaryType.tsym.flatName())
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1643
                sym.flags_field |= PROPRIETARY;
51833
91fd24cf57d5 8209058: Cannot find annotation method 'value()' in type 'Profile+Annotation'
jlahoda
parents: 51719
diff changeset
  1644
            else if (proxy.type.tsym.flatName() == syms.profileType.tsym.flatName()) {
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1645
                if (profile != Profile.DEFAULT) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1646
                    for (Pair<Name, Attribute> v : proxy.values) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1647
                        if (v.fst == names.value && v.snd instanceof Attribute.Constant) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1648
                            Attribute.Constant c = (Attribute.Constant)v.snd;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1649
                            if (c.type == syms.intType && ((Integer)c.value) > profile.value) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1650
                                sym.flags_field |= NOT_IN_PROFILE;
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 29842
diff changeset
  1651
                            }
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 29842
diff changeset
  1652
                        }
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 29842
diff changeset
  1653
                    }
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1654
                }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1655
            } else {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1656
                if (proxy.type.tsym == syms.annotationTargetType.tsym) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1657
                    target = proxy;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1658
                } else if (proxy.type.tsym == syms.repeatableType.tsym) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1659
                    repeatable = proxy;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1660
                } else if (proxy.type.tsym == syms.deprecatedType.tsym) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1661
                    sym.flags_field |= (DEPRECATED | DEPRECATED_ANNOTATION);
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1662
                    for (Pair<Name, Attribute> v : proxy.values) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1663
                        if (v.fst == names.forRemoval && v.snd instanceof Attribute.Constant) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1664
                            Attribute.Constant c = (Attribute.Constant)v.snd;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1665
                            if (c.type == syms.booleanType && ((Integer)c.value) != 0) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1666
                                sym.flags_field |= DEPRECATED_REMOVAL;
41637
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41254
diff changeset
  1667
                            }
7b24b4c32ee6 8145471: javac changes for enhanced deprecation
jjg
parents: 41254
diff changeset
  1668
                        }
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 29842
diff changeset
  1669
                    }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  1670
                }
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1671
                proxies.append(proxy);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1672
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1673
        }
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1674
        annotate.normal(new AnnotationCompleter(sym, proxies.toList()));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1675
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1676
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1677
    /** Read parameter annotations.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1678
     */
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1679
    void readParameterAnnotations(Symbol meth) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1680
        int numParameters = buf[bp++] & 0xFF;
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1681
        if (parameterAnnotations == null) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1682
            parameterAnnotations = new ParameterAnnotations[numParameters];
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1683
        } else if (parameterAnnotations.length != numParameters) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1684
            throw badClassFile("bad.runtime.invisible.param.annotations", meth);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1685
        }
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1686
        for (int pnum = 0; pnum < numParameters; pnum++) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1687
            if (parameterAnnotations[pnum] == null) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1688
                parameterAnnotations[pnum] = new ParameterAnnotations();
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1689
            }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  1690
            parameterAnnotations[pnum].add(readAnnotations());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1691
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1692
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1693
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1694
    void attachTypeAnnotations(final Symbol sym) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1695
        int numAttributes = nextChar();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1696
        if (numAttributes != 0) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20242
diff changeset
  1697
            ListBuffer<TypeAnnotationProxy> proxies = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1698
            for (int i = 0; i < numAttributes; i++)
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1699
                proxies.append(readTypeAnnotation());
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1700
            annotate.normal(new TypeAnnotationCompleter(sym, proxies.toList()));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1701
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1702
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1703
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1704
    /** Attach the default value for an annotation element.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1705
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1706
    void attachAnnotationDefault(final Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1707
        final MethodSymbol meth = (MethodSymbol)sym; // only on methods
06bc494ca11e Initial load
duke
parents:
diff changeset
  1708
        final Attribute value = readAttributeValue();
14804
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1709
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1710
        // 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
  1711
        // 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
  1712
        // repeating instances that depend on this default value,
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1713
        // 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
  1714
        // element (most likely) has a default.
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1715
        //
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1716
        // 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
  1717
        // properly at annotate time.
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  1718
        meth.defaultValue = value;
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13635
diff changeset
  1719
        annotate.normal(new AnnotationDefaultCompleter(meth, value));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1720
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1721
06bc494ca11e Initial load
duke
parents:
diff changeset
  1722
    Type readTypeOrClassSymbol(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1723
        // support preliminary jsr175-format class files
06bc494ca11e Initial load
duke
parents:
diff changeset
  1724
        if (buf[poolIdx[i]] == CONSTANT_Class)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1725
            return readClassSymbol(i).type;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1726
        return readTypeToProxy(i);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1727
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1728
    Type readEnumType(int i) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1729
        // support preliminary jsr175-format class files
06bc494ca11e Initial load
duke
parents:
diff changeset
  1730
        int index = poolIdx[i];
06bc494ca11e Initial load
duke
parents:
diff changeset
  1731
        int length = getChar(index + 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1732
        if (buf[index + length + 2] != ';')
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  1733
            return enterClass(readName(i)).type;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1734
        return readTypeToProxy(i);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1735
    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1736
    Type readTypeToProxy(int i) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1737
        if (currentModule.module_info == currentOwner) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1738
            int index = poolIdx[i];
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1739
            return new ProxyType(Arrays.copyOfRange(buf, index + 3, index + 3 + getChar(index + 1)));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1740
        } else {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1741
            return readType(i);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1742
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1743
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1744
06bc494ca11e Initial load
duke
parents:
diff changeset
  1745
    CompoundAnnotationProxy readCompoundAnnotation() {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1746
        Type t;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1747
        if (currentModule.module_info == currentOwner) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1748
            int index = poolIdx[nextChar()];
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1749
            t = new ProxyType(Arrays.copyOfRange(buf, index + 3, index + 3 + getChar(index + 1)));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1750
        } else {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1751
            t = readTypeOrClassSymbol(nextChar());
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1752
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1753
        int numFields = nextChar();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1754
        ListBuffer<Pair<Name,Attribute>> pairs = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1755
        for (int i=0; i<numFields; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1756
            Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1757
            Attribute value = readAttributeValue();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1758
            pairs.append(new Pair<>(name, value));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1759
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1760
        return new CompoundAnnotationProxy(t, pairs.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1761
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1762
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1763
    TypeAnnotationProxy readTypeAnnotation() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1764
        TypeAnnotationPosition position = readPosition();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1765
        CompoundAnnotationProxy proxy = readCompoundAnnotation();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1766
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1767
        return new TypeAnnotationProxy(proxy, position);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1768
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1769
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1770
    TypeAnnotationPosition readPosition() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1771
        int tag = nextByte(); // TargetType tag is a byte
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1772
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1773
        if (!TargetType.isValidTargetTypeValue(tag))
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  1774
            throw badClassFile("bad.type.annotation.value", String.format("0x%02X", tag));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1775
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1776
        TargetType type = TargetType.fromTargetTypeValue(tag);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1777
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1778
        switch (type) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1779
        // instanceof
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1780
        case INSTANCEOF: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1781
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1782
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1783
                TypeAnnotationPosition.instanceOf(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1784
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1785
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1786
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1787
        // new expression
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1788
        case NEW: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1789
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1790
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1791
                TypeAnnotationPosition.newObj(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1792
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1793
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1794
        }
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15385
diff changeset
  1795
        // constructor/method reference receiver
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1796
        case CONSTRUCTOR_REFERENCE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1797
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1798
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1799
                TypeAnnotationPosition.constructorRef(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1800
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1801
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1802
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1803
        case METHOD_REFERENCE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1804
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1805
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1806
                TypeAnnotationPosition.methodRef(readTypePath());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1807
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1808
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1809
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1810
        // local variable
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1811
        case LOCAL_VARIABLE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1812
            final int table_length = nextChar();
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1813
            final int[] newLvarOffset = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1814
            final int[] newLvarLength = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1815
            final int[] newLvarIndex = new int[table_length];
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1816
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1817
            for (int i = 0; i < table_length; ++i) {
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1818
                newLvarOffset[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1819
                newLvarLength[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1820
                newLvarIndex[i] = nextChar();
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1821
            }
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1822
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1823
            final TypeAnnotationPosition position =
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1824
                    TypeAnnotationPosition.localVariable(readTypePath());
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1825
            position.lvarOffset = newLvarOffset;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1826
            position.lvarLength = newLvarLength;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1827
            position.lvarIndex = newLvarIndex;
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1828
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1829
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1830
        // resource variable
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1831
        case RESOURCE_VARIABLE: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1832
            final int table_length = nextChar();
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1833
            final int[] newLvarOffset = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1834
            final int[] newLvarLength = new int[table_length];
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1835
            final int[] newLvarIndex = new int[table_length];
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1836
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1837
            for (int i = 0; i < table_length; ++i) {
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1838
                newLvarOffset[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1839
                newLvarLength[i] = nextChar();
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1840
                newLvarIndex[i] = nextChar();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1841
            }
24403
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1842
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1843
            final TypeAnnotationPosition position =
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1844
                    TypeAnnotationPosition.resourceVariable(readTypePath());
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1845
            position.lvarOffset = newLvarOffset;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1846
            position.lvarLength = newLvarLength;
f2ce14657001 8035763: Error parsing binary type annotations data in javac
emc
parents: 24396
diff changeset
  1847
            position.lvarIndex = newLvarIndex;
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1848
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1849
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1850
        // exception parameter
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1851
        case EXCEPTION_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1852
            final int exception_index = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1853
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1854
                TypeAnnotationPosition.exceptionParameter(readTypePath());
23975
c7c81595aea9 8040319: Clean up type annotation exception index generating code in Code.java
emc
parents: 23790
diff changeset
  1855
            position.setExceptionIndex(exception_index);
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1856
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1857
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1858
        // method receiver
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1859
        case METHOD_RECEIVER:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1860
            return TypeAnnotationPosition.methodReceiver(readTypePath());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1861
        // type parameter
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1862
        case CLASS_TYPE_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1863
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1864
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1865
                .typeParameter(readTypePath(), parameter_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1866
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1867
        case METHOD_TYPE_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1868
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1869
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1870
                .methodTypeParameter(readTypePath(), parameter_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1871
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1872
        // type parameter bound
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1873
        case CLASS_TYPE_PARAMETER_BOUND: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1874
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1875
            final int bound_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1876
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1877
                .typeParameterBound(readTypePath(), parameter_index,
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1878
                                    bound_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1879
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1880
        case METHOD_TYPE_PARAMETER_BOUND: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1881
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1882
            final int bound_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1883
            return TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1884
                .methodTypeParameterBound(readTypePath(), parameter_index,
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1885
                                          bound_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1886
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1887
        // class extends or implements clause
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1888
        case CLASS_EXTENDS: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1889
            final int type_index = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1890
            return TypeAnnotationPosition.classExtends(readTypePath(),
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1891
                                                       type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1892
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1893
        // throws
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1894
        case THROWS: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1895
            final int type_index = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1896
            return TypeAnnotationPosition.methodThrows(readTypePath(),
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1897
                                                       type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1898
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1899
        // method parameter
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1900
        case METHOD_FORMAL_PARAMETER: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1901
            final int parameter_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1902
            return TypeAnnotationPosition.methodParameter(readTypePath(),
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1903
                                                          parameter_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1904
        }
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15385
diff changeset
  1905
        // type cast
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1906
        case CAST: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1907
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1908
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1909
            final TypeAnnotationPosition position =
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1910
                TypeAnnotationPosition.typeCast(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1911
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1912
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1913
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1914
        // method/constructor/reference type argument
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1915
        case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1916
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1917
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1918
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1919
                .constructorInvocationTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1920
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1921
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1922
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1923
        case METHOD_INVOCATION_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1924
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1925
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1926
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1927
                .methodInvocationTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1928
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1929
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1930
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1931
        case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1932
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1933
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1934
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1935
                .constructorRefTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1936
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1937
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1938
        }
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1939
        case METHOD_REFERENCE_TYPE_ARGUMENT: {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1940
            final int offset = nextChar();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1941
            final int type_index = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1942
            final TypeAnnotationPosition position = TypeAnnotationPosition
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1943
                .methodRefTypeArg(readTypePath(), type_index);
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1944
            position.offset = offset;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1945
            return position;
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1946
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1947
        // We don't need to worry about these
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1948
        case METHOD_RETURN:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1949
            return TypeAnnotationPosition.methodReturn(readTypePath());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1950
        case FIELD:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1951
            return TypeAnnotationPosition.field(readTypePath());
26532
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1952
        case UNKNOWN:
aa84b6606229 8056021: checkin for JDK-8027262 breaks Checker Framework
jfranck
parents: 26266
diff changeset
  1953
            throw new AssertionError("jvm.ClassReader: UNKNOWN target type should never occur!");
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1954
        default:
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1955
            throw new AssertionError("jvm.ClassReader: Unknown target type for position: " + type);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1956
        }
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1957
    }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1958
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1959
    List<TypeAnnotationPosition.TypePathEntry> readTypePath() {
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1960
        int len = nextByte();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1961
        ListBuffer<Integer> loc = new ListBuffer<>();
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1962
        for (int i = 0; i < len * TypeAnnotationPosition.TypePathEntry.bytesPerEntry; ++i)
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1963
            loc = loc.append(nextByte());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1964
22702
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1965
        return TypeAnnotationPosition.getTypePathFromBinary(loc.toList());
1297fbaf34fa 8033004: Make base TypeAnnotationPosition data immutable, create better methods for creating base TypeAnnotationPositions
emc
parents: 22442
diff changeset
  1966
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1967
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  1968
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1969
    Attribute readAttributeValue() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1970
        char c = (char) buf[bp++];
06bc494ca11e Initial load
duke
parents:
diff changeset
  1971
        switch (c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1972
        case 'B':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1973
            return new Attribute.Constant(syms.byteType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1974
        case 'C':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1975
            return new Attribute.Constant(syms.charType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1976
        case 'D':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1977
            return new Attribute.Constant(syms.doubleType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1978
        case 'F':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1979
            return new Attribute.Constant(syms.floatType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1980
        case 'I':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1981
            return new Attribute.Constant(syms.intType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1982
        case 'J':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1983
            return new Attribute.Constant(syms.longType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1984
        case 'S':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1985
            return new Attribute.Constant(syms.shortType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1986
        case 'Z':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1987
            return new Attribute.Constant(syms.booleanType, readPool(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1988
        case 's':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1989
            return new Attribute.Constant(syms.stringType, readPool(nextChar()).toString());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1990
        case 'e':
06bc494ca11e Initial load
duke
parents:
diff changeset
  1991
            return new EnumAttributeProxy(readEnumType(nextChar()), readName(nextChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1992
        case 'c':
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  1993
            return new ClassAttributeProxy(readTypeOrClassSymbol(nextChar()));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1994
        case '[': {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1995
            int n = nextChar();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  1996
            ListBuffer<Attribute> l = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1997
            for (int i=0; i<n; i++)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1998
                l.append(readAttributeValue());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1999
            return new ArrayAttributeProxy(l.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2000
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2001
        case '@':
06bc494ca11e Initial load
duke
parents:
diff changeset
  2002
            return readCompoundAnnotation();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2003
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2004
            throw new AssertionError("unknown annotation tag '" + c + "'");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2005
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2006
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2007
06bc494ca11e Initial load
duke
parents:
diff changeset
  2008
    interface ProxyVisitor extends Attribute.Visitor {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2009
        void visitEnumAttributeProxy(EnumAttributeProxy proxy);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2010
        void visitClassAttributeProxy(ClassAttributeProxy proxy);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2011
        void visitArrayAttributeProxy(ArrayAttributeProxy proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2012
        void visitCompoundAnnotationProxy(CompoundAnnotationProxy proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2013
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2014
06bc494ca11e Initial load
duke
parents:
diff changeset
  2015
    static class EnumAttributeProxy extends Attribute {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2016
        Type enumType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2017
        Name enumerator;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2018
        public EnumAttributeProxy(Type enumType, Name enumerator) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2019
            super(null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2020
            this.enumType = enumType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2021
            this.enumerator = enumerator;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2022
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2023
        public void accept(Visitor v) { ((ProxyVisitor)v).visitEnumAttributeProxy(this); }
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2024
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2025
        public String toString() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2026
            return "/*proxy enum*/" + enumType + "." + enumerator;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2027
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2028
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2029
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2030
    static class ClassAttributeProxy extends Attribute {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2031
        Type classType;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2032
        public ClassAttributeProxy(Type classType) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2033
            super(null);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2034
            this.classType = classType;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2035
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2036
        public void accept(Visitor v) { ((ProxyVisitor)v).visitClassAttributeProxy(this); }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2037
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2038
        public String toString() {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2039
            return "/*proxy class*/" + classType + ".class";
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2040
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2041
    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2042
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2043
    static class ArrayAttributeProxy extends Attribute {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2044
        List<Attribute> values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2045
        ArrayAttributeProxy(List<Attribute> values) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2046
            super(null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2047
            this.values = values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2048
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2049
        public void accept(Visitor v) { ((ProxyVisitor)v).visitArrayAttributeProxy(this); }
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2050
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2051
        public String toString() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2052
            return "{" + values + "}";
06bc494ca11e Initial load
duke
parents:
diff changeset
  2053
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2054
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2055
06bc494ca11e Initial load
duke
parents:
diff changeset
  2056
    /** A temporary proxy representing a compound attribute.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2057
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2058
    static class CompoundAnnotationProxy extends Attribute {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2059
        final List<Pair<Name,Attribute>> values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2060
        public CompoundAnnotationProxy(Type type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2061
                                      List<Pair<Name,Attribute>> values) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2062
            super(type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2063
            this.values = values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2064
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2065
        public void accept(Visitor v) { ((ProxyVisitor)v).visitCompoundAnnotationProxy(this); }
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2066
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2067
        public String toString() {
7624
c31b0ea95b37 6999210: javac should be able to warn of anomalous conditions in classfiles
jjg
parents: 7330
diff changeset
  2068
            StringBuilder buf = new StringBuilder();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2069
            buf.append("@");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2070
            buf.append(type.tsym.getQualifiedName());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2071
            buf.append("/*proxy*/{");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2072
            boolean first = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2073
            for (List<Pair<Name,Attribute>> v = values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2074
                 v.nonEmpty(); v = v.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2075
                Pair<Name,Attribute> value = v.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2076
                if (!first) buf.append(",");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2077
                first = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2078
                buf.append(value.fst);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2079
                buf.append("=");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2080
                buf.append(value.snd);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2081
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2082
            buf.append("}");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2083
            return buf.toString();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2084
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2085
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2086
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2087
    /** A temporary proxy representing a type annotation.
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2088
     */
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2089
    static class TypeAnnotationProxy {
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2090
        final CompoundAnnotationProxy compound;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2091
        final TypeAnnotationPosition position;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2092
        public TypeAnnotationProxy(CompoundAnnotationProxy compound,
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2093
                TypeAnnotationPosition position) {
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2094
            this.compound = compound;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2095
            this.position = position;
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2096
        }
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2097
    }
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2098
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2099
    class AnnotationDeproxy implements ProxyVisitor {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2100
        private ClassSymbol requestingOwner;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2101
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2102
        AnnotationDeproxy(ClassSymbol owner) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2103
            this.requestingOwner = owner;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2104
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2105
06bc494ca11e Initial load
duke
parents:
diff changeset
  2106
        List<Attribute.Compound> deproxyCompoundList(List<CompoundAnnotationProxy> pl) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2107
            // also must fill in types!!!!
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  2108
            ListBuffer<Attribute.Compound> buf = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2109
            for (List<CompoundAnnotationProxy> l = pl; l.nonEmpty(); l=l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2110
                buf.append(deproxyCompound(l.head));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2111
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2112
            return buf.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2113
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2114
06bc494ca11e Initial load
duke
parents:
diff changeset
  2115
        Attribute.Compound deproxyCompound(CompoundAnnotationProxy a) {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2116
            Type annotationType = resolvePossibleProxyType(a.type);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  2117
            ListBuffer<Pair<Symbol.MethodSymbol,Attribute>> buf = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2118
            for (List<Pair<Name,Attribute>> l = a.values;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2119
                 l.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2120
                 l = l.tail) {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2121
                MethodSymbol meth = findAccessMethod(annotationType, l.head.fst);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 21043
diff changeset
  2122
                buf.append(new Pair<>(meth, deproxy(meth.type.getReturnType(), l.head.snd)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2123
            }
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2124
            return new Attribute.Compound(annotationType, buf.toList());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2125
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2126
06bc494ca11e Initial load
duke
parents:
diff changeset
  2127
        MethodSymbol findAccessMethod(Type container, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2128
            CompletionFailure failure = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2129
            try {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  2130
                for (Symbol sym : container.tsym.members().getSymbolsByName(name)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2131
                    if (sym.kind == MTH && sym.type.getParameterTypes().length() == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2132
                        return (MethodSymbol) sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2133
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2134
            } catch (CompletionFailure ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2135
                failure = ex;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2136
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2137
            // The method wasn't found: emit a warning and recover
06bc494ca11e Initial load
duke
parents:
diff changeset
  2138
            JavaFileObject prevSource = log.useSource(requestingOwner.classfile);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2139
            try {
28333
8eeea699174c 8068639: Make certain annotation classfile warnings opt-in
darcy
parents: 27858
diff changeset
  2140
                if (lintClassfile) {
8eeea699174c 8068639: Make certain annotation classfile warnings opt-in
darcy
parents: 27858
diff changeset
  2141
                    if (failure == null) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2142
                        log.warning(Warnings.AnnotationMethodNotFound(container, name));
28333
8eeea699174c 8068639: Make certain annotation classfile warnings opt-in
darcy
parents: 27858
diff changeset
  2143
                    } else {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2144
                        log.warning(Warnings.AnnotationMethodNotFoundReason(container,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2145
                                                                            name,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2146
                                                                            failure.getDetailValue()));//diagnostic, if present
28333
8eeea699174c 8068639: Make certain annotation classfile warnings opt-in
darcy
parents: 27858
diff changeset
  2147
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2148
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2149
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2150
                log.useSource(prevSource);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2151
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2152
            // Construct a new method type and symbol.  Use bottom
06bc494ca11e Initial load
duke
parents:
diff changeset
  2153
            // type (typeof null) as return type because this type is
06bc494ca11e Initial load
duke
parents:
diff changeset
  2154
            // a subtype of all reference types and can be converted
06bc494ca11e Initial load
duke
parents:
diff changeset
  2155
            // to primitive types by unboxing.
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42822
diff changeset
  2156
            MethodType mt = new MethodType(List.nil(),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2157
                                           syms.botType,
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42822
diff changeset
  2158
                                           List.nil(),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2159
                                           syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2160
            return new MethodSymbol(PUBLIC | ABSTRACT, name, mt, container.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2161
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2162
06bc494ca11e Initial load
duke
parents:
diff changeset
  2163
        Attribute result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2164
        Type type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2165
        Attribute deproxy(Type t, Attribute a) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2166
            Type oldType = type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2167
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2168
                type = t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2169
                a.accept(this);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2170
                return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2171
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2172
                type = oldType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2173
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2174
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2175
06bc494ca11e Initial load
duke
parents:
diff changeset
  2176
        // implement Attribute.Visitor below
06bc494ca11e Initial load
duke
parents:
diff changeset
  2177
06bc494ca11e Initial load
duke
parents:
diff changeset
  2178
        public void visitConstant(Attribute.Constant value) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2179
            // assert value.type == type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2180
            result = value;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2181
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2182
06bc494ca11e Initial load
duke
parents:
diff changeset
  2183
        public void visitClass(Attribute.Class clazz) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2184
            result = clazz;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2185
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2186
06bc494ca11e Initial load
duke
parents:
diff changeset
  2187
        public void visitEnum(Attribute.Enum e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2188
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  2189
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2190
06bc494ca11e Initial load
duke
parents:
diff changeset
  2191
        public void visitCompound(Attribute.Compound compound) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2192
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  2193
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2194
06bc494ca11e Initial load
duke
parents:
diff changeset
  2195
        public void visitArray(Attribute.Array array) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2196
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  2197
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2198
06bc494ca11e Initial load
duke
parents:
diff changeset
  2199
        public void visitError(Attribute.Error e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2200
            throw new AssertionError(); // shouldn't happen
06bc494ca11e Initial load
duke
parents:
diff changeset
  2201
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2202
06bc494ca11e Initial load
duke
parents:
diff changeset
  2203
        public void visitEnumAttributeProxy(EnumAttributeProxy proxy) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2204
            // type.tsym.flatName() should == proxy.enumFlatName
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2205
            Type enumType = resolvePossibleProxyType(proxy.enumType);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2206
            TypeSymbol enumTypeSym = enumType.tsym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2207
            VarSymbol enumerator = null;
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2208
            CompletionFailure failure = null;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2209
            try {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  2210
                for (Symbol sym : enumTypeSym.members().getSymbolsByName(proxy.enumerator)) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  2211
                    if (sym.kind == VAR) {
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  2212
                        enumerator = (VarSymbol)sym;
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2213
                        break;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2214
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2215
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2216
            }
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2217
            catch (CompletionFailure ex) {
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2218
                failure = ex;
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2219
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2220
            if (enumerator == null) {
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2221
                if (failure != null) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2222
                    log.warning(Warnings.UnknownEnumConstantReason(currentClassFile,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2223
                                                                   enumTypeSym,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2224
                                                                   proxy.enumerator,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2225
                                                                   failure.getDiagnostic()));
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2226
                } else {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2227
                    log.warning(Warnings.UnknownEnumConstant(currentClassFile,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2228
                                                             enumTypeSym,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2229
                                                             proxy.enumerator));
9603
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2230
                }
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2231
                result = new Attribute.Enum(enumTypeSym.type,
fa337b87574b 6550655: com.sun.tools.javac.code.Symbol$CompletionFailure
mcimadamore
parents: 9082
diff changeset
  2232
                        new VarSymbol(0, proxy.enumerator, syms.botType, enumTypeSym));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2233
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2234
                result = new Attribute.Enum(enumTypeSym.type, enumerator);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2235
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2236
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2237
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2238
        @Override
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2239
        public void visitClassAttributeProxy(ClassAttributeProxy proxy) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2240
            Type classType = resolvePossibleProxyType(proxy.classType);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2241
            result = new Attribute.Class(types, classType);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2242
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2243
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2244
        public void visitArrayAttributeProxy(ArrayAttributeProxy proxy) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2245
            int length = proxy.values.length();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2246
            Attribute[] ats = new Attribute[length];
06bc494ca11e Initial load
duke
parents:
diff changeset
  2247
            Type elemtype = types.elemtype(type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2248
            int i = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2249
            for (List<Attribute> p = proxy.values; p.nonEmpty(); p = p.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2250
                ats[i++] = deproxy(elemtype, p.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2251
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2252
            result = new Attribute.Array(type, ats);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2253
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2254
06bc494ca11e Initial load
duke
parents:
diff changeset
  2255
        public void visitCompoundAnnotationProxy(CompoundAnnotationProxy proxy) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2256
            result = deproxyCompound(proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2257
        }
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2258
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2259
        Type resolvePossibleProxyType(Type t) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2260
            if (t instanceof ProxyType) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2261
                Assert.check(requestingOwner.owner.kind == MDL);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2262
                ModuleSymbol prevCurrentModule = currentModule;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2263
                currentModule = (ModuleSymbol) requestingOwner.owner;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2264
                try {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2265
                    return ((ProxyType) t).resolve();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2266
                } finally {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2267
                    currentModule = prevCurrentModule;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2268
                }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2269
            } else {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2270
                return t;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2271
            }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2272
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2273
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2274
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2275
    class AnnotationDefaultCompleter extends AnnotationDeproxy implements Runnable {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2276
        final MethodSymbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2277
        final Attribute value;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2278
        final JavaFileObject classFile = currentClassFile;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2279
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2280
        AnnotationDefaultCompleter(MethodSymbol sym, Attribute value) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2281
            super(currentOwner.kind == MTH
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2282
                    ? currentOwner.enclClass() : (ClassSymbol)currentOwner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2283
            this.sym = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2284
            this.value = value;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2285
        }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2286
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2287
        @Override
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  2288
        public void run() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2289
            JavaFileObject previousClassFile = currentClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2290
            try {
14804
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  2291
                // Reset the interim value set earlier in
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  2292
                // attachAnnotationDefault().
f93a8d60b9a4 8001114: Container annotation is not checked for semantic correctness
jfranck
parents: 14725
diff changeset
  2293
                sym.defaultValue = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2294
                currentClassFile = classFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2295
                sym.defaultValue = deproxy(sym.type.getReturnType(), value);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2296
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2297
                currentClassFile = previousClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2298
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2299
        }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2300
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2301
        @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2302
        public String toString() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2303
            return " ClassReader store default for " + sym.owner + "." + sym + " is " + value;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2304
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2305
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2306
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2307
    class AnnotationCompleter extends AnnotationDeproxy implements Runnable {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2308
        final Symbol sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2309
        final List<CompoundAnnotationProxy> l;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2310
        final JavaFileObject classFile;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2311
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2312
        AnnotationCompleter(Symbol sym, List<CompoundAnnotationProxy> l) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2313
            super(currentOwner.kind == MTH
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2314
                    ? currentOwner.enclClass() : (ClassSymbol)currentOwner);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2315
            if (sym.kind == TYP && sym.owner.kind == MDL) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2316
                this.sym = sym.owner;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2317
            } else {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2318
                this.sym = sym;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2319
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2320
            this.l = l;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2321
            this.classFile = currentClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2322
        }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2323
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2324
        @Override
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  2325
        public void run() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2326
            JavaFileObject previousClassFile = currentClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2327
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2328
                currentClassFile = classFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2329
                List<Attribute.Compound> newList = deproxyCompoundList(l);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2330
                for (Attribute.Compound attr : newList) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2331
                    if (attr.type.tsym == syms.deprecatedType.tsym) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2332
                        sym.flags_field |= (DEPRECATED | DEPRECATED_ANNOTATION);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2333
                        Attribute forRemoval = attr.member(names.forRemoval);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2334
                        if (forRemoval instanceof Attribute.Constant) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2335
                            Attribute.Constant c = (Attribute.Constant) forRemoval;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2336
                            if (c.type == syms.booleanType && ((Integer) c.value) != 0) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2337
                                sym.flags_field |= DEPRECATED_REMOVAL;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2338
                            }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2339
                        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2340
                    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2341
                }
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17578
diff changeset
  2342
                if (sym.annotationsPendingCompletion()) {
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17578
diff changeset
  2343
                    sym.setDeclarationAttributes(newList);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13635
diff changeset
  2344
                } else {
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17578
diff changeset
  2345
                    sym.appendAttributes(newList);
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13635
diff changeset
  2346
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2347
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2348
                currentClassFile = previousClassFile;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2349
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2350
        }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2351
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2352
        @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2353
        public String toString() {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2354
            return " ClassReader annotate " + sym.owner + "." + sym + " with " + l;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2355
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2356
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2357
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2358
    class TypeAnnotationCompleter extends AnnotationCompleter {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2359
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2360
        List<TypeAnnotationProxy> proxies;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2361
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2362
        TypeAnnotationCompleter(Symbol sym,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2363
                List<TypeAnnotationProxy> proxies) {
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 42822
diff changeset
  2364
            super(sym, List.nil());
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2365
            this.proxies = proxies;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2366
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2367
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2368
        List<Attribute.TypeCompound> deproxyTypeCompoundList(List<TypeAnnotationProxy> proxies) {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20242
diff changeset
  2369
            ListBuffer<Attribute.TypeCompound> buf = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2370
            for (TypeAnnotationProxy proxy: proxies) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2371
                Attribute.Compound compound = deproxyCompound(proxy.compound);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2372
                Attribute.TypeCompound typeCompound = new Attribute.TypeCompound(compound, proxy.position);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2373
                buf.add(typeCompound);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2374
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2375
            return buf.toList();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2376
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2377
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2378
        @Override
21040
3e32f68d2151 8026510: The name of com.sun.tools.javac.comp.Annotate.Annotator is confusing
jlahoda
parents: 21006
diff changeset
  2379
        public void run() {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2380
            JavaFileObject previousClassFile = currentClassFile;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2381
            try {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2382
                currentClassFile = classFile;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2383
                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
  2384
                sym.setTypeAttributes(newList.prependList(sym.getRawTypeAttributes()));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2385
            } finally {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2386
                currentClassFile = previousClassFile;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2387
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2388
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2389
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15031
diff changeset
  2390
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2391
06bc494ca11e Initial load
duke
parents:
diff changeset
  2392
/************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2393
 * Reading Symbols
06bc494ca11e Initial load
duke
parents:
diff changeset
  2394
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2395
06bc494ca11e Initial load
duke
parents:
diff changeset
  2396
    /** Read a field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2397
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2398
    VarSymbol readField() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2399
        long flags = adjustFieldFlags(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2400
        Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2401
        Type type = readType(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2402
        VarSymbol v = new VarSymbol(flags, name, type, currentOwner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2403
        readMemberAttrs(v);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2404
        return v;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2405
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2406
06bc494ca11e Initial load
duke
parents:
diff changeset
  2407
    /** Read a method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2408
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2409
    MethodSymbol readMethod() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2410
        long flags = adjustMethodFlags(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2411
        Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2412
        Type type = readType(nextChar());
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2413
        if (currentOwner.isInterface() &&
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2414
                (flags & ABSTRACT) == 0 && !name.equals(names.clinit)) {
24606
12c0ca21f8dc 8042406: javac.jvm.ClassReader.readClassFile() is using Target to verify valid major versions
ntoda
parents: 24604
diff changeset
  2415
            if (majorVersion > Version.V52.major ||
12c0ca21f8dc 8042406: javac.jvm.ClassReader.readClassFile() is using Target to verify valid major versions
ntoda
parents: 24604
diff changeset
  2416
                    (majorVersion == Version.V52.major && minorVersion >= Version.V52.minor)) {
44183
17244500b154 8175184: Annotation processor observes interface private methods as default methods
sadayapalam
parents: 43268
diff changeset
  2417
                if ((flags & (STATIC | PRIVATE)) == 0) {
21006
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2418
                    currentOwner.flags_field |= DEFAULT;
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2419
                    flags |= DEFAULT | ABSTRACT;
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2420
                }
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2421
            } else {
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2422
                //protect against ill-formed classfiles
21006
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2423
                throw badClassFile((flags & STATIC) == 0 ? "invalid.default.interface" : "invalid.static.interface",
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2424
                                   Integer.toString(majorVersion),
534673718919 8025087: Annotation processing api returns default modifier for interface static method
jlahoda
parents: 20249
diff changeset
  2425
                                   Integer.toString(minorVersion));
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2426
            }
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14443
diff changeset
  2427
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2428
        if (name == names.init && currentOwner.hasOuterInstance()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2429
            // Sometimes anonymous classes don't have an outer
06bc494ca11e Initial load
duke
parents:
diff changeset
  2430
            // instance, however, there is no reliable way to tell so
06bc494ca11e Initial load
duke
parents:
diff changeset
  2431
            // we never strip this$n
41991
cc8a2784dd4c 8166700: NPE during invoking getEnclosedElements() on javax.lang.model.element.Element instance representing a package
jlahoda
parents: 41935
diff changeset
  2432
            // ditto for local classes. Local classes that have an enclosing method set
cc8a2784dd4c 8166700: NPE during invoking getEnclosedElements() on javax.lang.model.element.Element instance representing a package
jlahoda
parents: 41935
diff changeset
  2433
            // won't pass the "hasOuterInstance" check above, but those that don't have an
cc8a2784dd4c 8166700: NPE during invoking getEnclosedElements() on javax.lang.model.element.Element instance representing a package
jlahoda
parents: 41935
diff changeset
  2434
            // enclosing method (i.e. from initializers) will pass that check.
cc8a2784dd4c 8166700: NPE during invoking getEnclosedElements() on javax.lang.model.element.Element instance representing a package
jlahoda
parents: 41935
diff changeset
  2435
            boolean local = !currentOwner.owner.members().includes(currentOwner, LookupKind.NON_RECURSIVE);
cc8a2784dd4c 8166700: NPE during invoking getEnclosedElements() on javax.lang.model.element.Element instance representing a package
jlahoda
parents: 41935
diff changeset
  2436
            if (!currentOwner.name.isEmpty() && !local)
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2437
                type = new MethodType(adjustMethodParams(flags, type.getParameterTypes()),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2438
                                      type.getReturnType(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2439
                                      type.getThrownTypes(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2440
                                      syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2441
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2442
        MethodSymbol m = new MethodSymbol(flags, name, type, currentOwner);
18389
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18010
diff changeset
  2443
        if (types.isSignaturePolymorphic(m)) {
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18010
diff changeset
  2444
            m.flags_field |= SIGNATURE_POLYMORPHIC;
a425d0819f36 8016569: javac, add new flag for polymorphic method signatures
vromero
parents: 18010
diff changeset
  2445
        }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2446
        if (saveParameterNames)
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2447
            initParameterNames(m);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2448
        Symbol prevOwner = currentOwner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2449
        currentOwner = m;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2450
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2451
            readMemberAttrs(m);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2452
        } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2453
            currentOwner = prevOwner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2454
        }
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2455
        setParameters(m, type);
29551
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2456
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2457
        if ((flags & VARARGS) != 0) {
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2458
            final Type last = type.getParameterTypes().last();
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2459
            if (last == null || !last.hasTag(ARRAY)) {
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2460
                m.flags_field &= ~VARARGS;
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2461
                throw badClassFile("malformed.vararg.method", m);
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2462
            }
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2463
        }
cad66be66e2e 8071847: java.lang.NullPointerException at com.sun.tools.javac.code.Types.elemtype(Types.java:1870)
sadayapalam
parents: 28333
diff changeset
  2464
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2465
        return m;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2466
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2467
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2468
    private List<Type> adjustMethodParams(long flags, List<Type> args) {
51719
e3411e5e473d 8207160: ClassReader::adjustMethodParams can potentially return null if the args list is empty
vromero
parents: 51047
diff changeset
  2469
        if (args.isEmpty()) {
e3411e5e473d 8207160: ClassReader::adjustMethodParams can potentially return null if the args list is empty
vromero
parents: 51047
diff changeset
  2470
            return args;
e3411e5e473d 8207160: ClassReader::adjustMethodParams can potentially return null if the args list is empty
vromero
parents: 51047
diff changeset
  2471
        }
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2472
        boolean isVarargs = (flags & VARARGS) != 0;
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2473
        if (isVarargs) {
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2474
            Type varargsElem = args.last();
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 20242
diff changeset
  2475
            ListBuffer<Type> adjustedArgs = new ListBuffer<>();
7643
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2476
            for (Type t : args) {
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2477
                adjustedArgs.append(t != varargsElem ?
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2478
                    t :
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2479
                    ((ArrayType)t).makeVarargs());
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2480
            }
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2481
            args = adjustedArgs.toList();
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2482
        }
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2483
        return args.tail;
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2484
    }
a067a0cda531 6993978: Project Coin: Compiler support of annotation to reduce varargs warnings
mcimadamore
parents: 7632
diff changeset
  2485
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2486
    /**
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2487
     * Init the parameter names array.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2488
     * 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
  2489
     * 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
  2490
     * (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
  2491
     * methods without a Code attribute.)
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2492
     * 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
  2493
     * 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
  2494
     * 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
  2495
     */
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2496
    void initParameterNames(MethodSymbol sym) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2497
        // make allowance for synthetic parameters.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2498
        final int excessSlots = 4;
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2499
        int expectedParameterSlots =
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2500
                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
  2501
        if (parameterNameIndices == null
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2502
                || parameterNameIndices.length < expectedParameterSlots) {
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2503
            parameterNameIndices = new int[expectedParameterSlots];
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2504
        } else
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2505
            Arrays.fill(parameterNameIndices, 0);
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2506
        haveParameterNameIndices = false;
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2507
        sawMethodParameters = false;
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2508
    }
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2509
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2510
    /**
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2511
     * Set the parameters for a method symbol, including any names and
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2512
     * annotations that were read.
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2513
     *
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2514
     * <p>The type of the symbol may have changed while reading the
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2515
     * method attributes (see the Signature attribute). This may be
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2516
     * because of generic information or because anonymous synthetic
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2517
     * parameters were added.   The original type (as read from the
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2518
     * method descriptor) is used to help guess the existence of
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2519
     * anonymous synthetic parameters.
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2520
     */
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2521
    void setParameters(MethodSymbol sym, Type jvmType) {
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2522
        // If we get parameter names from MethodParameters, then we
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2523
        // don't need to skip.
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2524
        int firstParam = 0;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2525
        if (!sawMethodParameters) {
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2526
            firstParam = ((sym.flags() & STATIC) == 0) ? 1 : 0;
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2527
            // the code in readMethod may have skipped the first
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2528
            // parameter when setting up the MethodType. If so, we
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2529
            // make a corresponding allowance here for the position of
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2530
            // the first parameter.  Note that this assumes the
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2531
            // skipped parameter has a width of 1 -- i.e. it is not
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2532
            // a double width type (long or double.)
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2533
            if (sym.name == names.init && currentOwner.hasOuterInstance()) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2534
                // Sometimes anonymous classes don't have an outer
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2535
                // instance, however, there is no reliable way to tell so
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2536
                // we never strip this$n
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2537
                if (!currentOwner.name.isEmpty())
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2538
                    firstParam += 1;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2539
            }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2540
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2541
            if (sym.type != jvmType) {
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2542
                // reading the method attributes has caused the
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2543
                // symbol's type to be changed. (i.e. the Signature
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2544
                // attribute.)  This may happen if there are hidden
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2545
                // (synthetic) parameters in the descriptor, but not
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2546
                // in the Signature.  The position of these hidden
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2547
                // parameters is unspecified; for now, assume they are
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2548
                // at the beginning, and so skip over them. The
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2549
                // primary case for this is two hidden parameters
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2550
                // passed into Enum constructors.
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2551
                int skip = Code.width(jvmType.getParameterTypes())
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2552
                        - Code.width(sym.type.getParameterTypes());
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2553
                firstParam += skip;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2554
            }
15031
c4fad55a5681 8004727: Add compiler support for parameter reflection
jjg
parents: 14949
diff changeset
  2555
        }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2556
        List<Name> paramNames = List.nil();
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2557
        ListBuffer<VarSymbol> params = new ListBuffer<>();
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2558
        int nameIndex = firstParam;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2559
        int annotationIndex = 0;
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2560
        for (Type t: sym.type.getParameterTypes()) {
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2561
            Name name = parameterName(nameIndex, paramNames);
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2562
            paramNames = paramNames.prepend(name);
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2563
            VarSymbol param = new VarSymbol(PARAMETER, name, t, sym);
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2564
            params.append(param);
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2565
            if (parameterAnnotations != null) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2566
                ParameterAnnotations annotations = parameterAnnotations[annotationIndex];
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2567
                if (annotations != null && annotations.proxies != null
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2568
                        && !annotations.proxies.isEmpty()) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2569
                    annotate.normal(new AnnotationCompleter(param, annotations.proxies));
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2570
                }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2571
            }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2572
            nameIndex += sawMethodParameters ? 1 : Code.width(t);
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2573
            annotationIndex++;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2574
        }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2575
        if (parameterAnnotations != null && parameterAnnotations.length != annotationIndex) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2576
            throw badClassFile("bad.runtime.invisible.param.annotations", sym);
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2577
        }
48344
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2578
        Assert.checkNull(sym.params);
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2579
        sym.params = params.toList();
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2580
        parameterAnnotations = null;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2581
        parameterNameIndices = null;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2582
    }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2583
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2584
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2585
    // Returns the name for the parameter at position 'index', either using
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2586
    // names read from the MethodParameters, or by synthesizing a name that
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2587
    // is not on the 'exclude' list.
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2588
    private Name parameterName(int index, List<Name> exclude) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2589
        if (parameterNameIndices != null && index < parameterNameIndices.length
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2590
                && parameterNameIndices[index] != 0) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2591
            return readName(parameterNameIndices[index]);
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2592
        }
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2593
        String prefix = "arg";
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2594
        while (true) {
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2595
            Name argName = names.fromString(prefix + exclude.size());
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2596
            if (!exclude.contains(argName))
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2597
                return argName;
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2598
            prefix += "$";
89f6aa26fd6c 8007720: Names are not loaded correctly for method parameters if the parameters have annotations
cushon
parents: 48081
diff changeset
  2599
        }
4077
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2600
    }
0096541a388e 6889255: javac MethodSymbol throws NPE if ClassReader does not read parameter names correctly
jjg
parents: 4073
diff changeset
  2601
8042
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2602
    /**
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2603
     * skip n bytes
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2604
     */
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2605
    void skipBytes(int n) {
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2606
        bp = bp + n;
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2607
    }
d534dd80da9f 6982999: tools must support -target 7 bytecodes
ksrini
parents: 8032
diff changeset
  2608
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2609
    /** Skip a field or method
06bc494ca11e Initial load
duke
parents:
diff changeset
  2610
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2611
    void skipMember() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2612
        bp = bp + 6;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2613
        char ac = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2614
        for (int i = 0; i < ac; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2615
            bp = bp + 2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2616
            int attrLen = nextInt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2617
            bp = bp + attrLen;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2618
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2619
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2620
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2621
    void skipInnerClasses() {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2622
        int n = nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2623
        for (int i = 0; i < n; i++) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2624
            nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2625
            nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2626
            nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2627
            nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2628
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2629
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2630
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2631
    /** Enter type variables of this classtype and all enclosing ones in
06bc494ca11e Initial load
duke
parents:
diff changeset
  2632
     *  `typevars'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2633
     */
41935
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2634
    protected void enterTypevars(Symbol sym, Type t) {
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2635
        if (t.getEnclosingType() != null) {
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2636
            if (!t.getEnclosingType().hasTag(TypeTag.NONE)) {
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2637
                enterTypevars(sym.owner, t.getEnclosingType());
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2638
            }
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2639
        } else if (sym.kind == MTH && !sym.isStatic()) {
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2640
            enterTypevars(sym.owner, sym.owner.type);
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2641
        }
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2642
        for (List<Type> xs = t.getTypeArguments(); xs.nonEmpty(); xs = xs.tail) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2643
            typevars.enter(xs.head.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2644
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2645
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2646
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2647
    protected ClassSymbol enterClass(Name name) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2648
        return syms.enterClass(currentModule, name);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2649
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2650
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2651
    protected ClassSymbol enterClass(Name name, TypeSymbol owner) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2652
        return syms.enterClass(currentModule, name, owner);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2653
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2654
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2655
    /** Read contents of a given class symbol `c'. Both external and internal
06bc494ca11e Initial load
duke
parents:
diff changeset
  2656
     *  versions of an inner class are read.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2657
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2658
    void readClass(ClassSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2659
        ClassType ct = (ClassType)c.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2660
06bc494ca11e Initial load
duke
parents:
diff changeset
  2661
        // allocate scope for members
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24895
diff changeset
  2662
        c.members_field = WriteableScope.create(c);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2663
06bc494ca11e Initial load
duke
parents:
diff changeset
  2664
        // prepare type variable table
06bc494ca11e Initial load
duke
parents:
diff changeset
  2665
        typevars = typevars.dup(currentOwner);
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 13689
diff changeset
  2666
        if (ct.getEnclosingType().hasTag(CLASS))
41935
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2667
            enterTypevars(c.owner, ct.getEnclosingType());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2668
06bc494ca11e Initial load
duke
parents:
diff changeset
  2669
        // read flags, or skip if this is an inner class
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2670
        long f = nextChar();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2671
        long flags = adjustClassFlags(f);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2672
        if ((flags & MODULE) == 0) {
49197
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
  2673
            if (c.owner.kind == PCK || c.owner.kind == ERR) c.flags_field = flags;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2674
            // read own class name and check that it matches
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2675
            currentModule = c.packge().modle;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2676
            ClassSymbol self = readClassSymbol(nextChar());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2677
            if (c != self) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2678
                throw badClassFile("class.file.wrong.class",
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2679
                                   self.flatname);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2680
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2681
        } else {
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  2682
            if (majorVersion < Version.V53.major) {
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  2683
                throw badClassFile("anachronistic.module.info",
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  2684
                        Integer.toString(majorVersion),
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  2685
                        Integer.toString(minorVersion));
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  2686
            }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2687
            c.flags_field = flags;
41254
08f8dbf7741e 8152911: javac assertion error when compiling overlay sources
jlahoda
parents: 40502
diff changeset
  2688
            currentModule = (ModuleSymbol) c.owner;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2689
            int this_class = nextChar();
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42497
diff changeset
  2690
            // temp, no check on this_class
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2691
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2692
06bc494ca11e Initial load
duke
parents:
diff changeset
  2693
        // class attributes must be read before class
06bc494ca11e Initial load
duke
parents:
diff changeset
  2694
        // skip ahead to read class attributes
06bc494ca11e Initial load
duke
parents:
diff changeset
  2695
        int startbp = bp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2696
        nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2697
        char interfaceCount = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2698
        bp += interfaceCount * 2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2699
        char fieldCount = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2700
        for (int i = 0; i < fieldCount; i++) skipMember();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2701
        char methodCount = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2702
        for (int i = 0; i < methodCount; i++) skipMember();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2703
        readClassAttrs(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2704
06bc494ca11e Initial load
duke
parents:
diff changeset
  2705
        if (readAllOfClassFile) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2706
            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
  2707
            c.pool = new Pool(poolObj.length, poolObj, types);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2708
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2709
06bc494ca11e Initial load
duke
parents:
diff changeset
  2710
        // reset and read rest of classinfo
06bc494ca11e Initial load
duke
parents:
diff changeset
  2711
        bp = startbp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2712
        int n = nextChar();
39361
cd0aca7db174 8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents: 39178
diff changeset
  2713
        if ((flags & MODULE) != 0 && n > 0) {
cd0aca7db174 8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents: 39178
diff changeset
  2714
            throw badClassFile("module.info.invalid.super.class");
cd0aca7db174 8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents: 39178
diff changeset
  2715
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2716
        if (ct.supertype_field == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2717
            ct.supertype_field = (n == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2718
                ? Type.noType
06bc494ca11e Initial load
duke
parents:
diff changeset
  2719
                : readClassSymbol(n).erasure(types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2720
        n = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2721
        List<Type> is = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2722
        for (int i = 0; i < n; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2723
            Type _inter = readClassSymbol(nextChar()).erasure(types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2724
            is = is.prepend(_inter);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2725
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2726
        if (ct.interfaces_field == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2727
            ct.interfaces_field = is.reverse();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2728
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  2729
        Assert.check(fieldCount == nextChar());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2730
        for (int i = 0; i < fieldCount; i++) enterMember(c, readField());
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  2731
        Assert.check(methodCount == nextChar());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2732
        for (int i = 0; i < methodCount; i++) enterMember(c, readMethod());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2733
06bc494ca11e Initial load
duke
parents:
diff changeset
  2734
        typevars = typevars.leave();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2735
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2736
06bc494ca11e Initial load
duke
parents:
diff changeset
  2737
    /** Read inner class info. For each inner/outer pair allocate a
06bc494ca11e Initial load
duke
parents:
diff changeset
  2738
     *  member class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2739
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2740
    void readInnerClasses(ClassSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2741
        int n = nextChar();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2742
        for (int i = 0; i < n; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2743
            nextChar(); // skip inner class symbol
06bc494ca11e Initial load
duke
parents:
diff changeset
  2744
            ClassSymbol outer = readClassSymbol(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2745
            Name name = readName(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2746
            if (name == null) name = names.empty;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2747
            long flags = adjustClassFlags(nextChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2748
            if (outer != null) { // we have a member class
06bc494ca11e Initial load
duke
parents:
diff changeset
  2749
                if (name == names.empty)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2750
                    name = names.one;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2751
                ClassSymbol member = enterClass(name, outer);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2752
                if ((flags & STATIC) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2753
                    ((ClassType)member.type).setEnclosingType(outer.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2754
                    if (member.erasure_field != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2755
                        ((ClassType)member.erasure_field).setEnclosingType(types.erasure(outer.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2756
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2757
                if (c == outer) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2758
                    member.flags_field = flags;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2759
                    enterMember(c, member);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2760
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2761
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2762
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2763
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2764
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2765
    /** Read a class definition from the bytes in buf.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2766
     */
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2767
    private void readClassBuffer(ClassSymbol c) throws IOException {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2768
        int magic = nextInt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2769
        if (magic != JAVA_MAGIC)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2770
            throw badClassFile("illegal.start.of.class.file");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2771
2513
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  2772
        minorVersion = nextChar();
1cbbf23b22f9 6817950: refactor ClassReader to improve attribute handling
jjg
parents: 1260
diff changeset
  2773
        majorVersion = nextChar();
48081
89829dd3cc54 8188870: Bump classfile version number to 54
psandoz
parents: 48054
diff changeset
  2774
        int maxMajor = Version.MAX().major;
24606
12c0ca21f8dc 8042406: javac.jvm.ClassReader.readClassFile() is using Target to verify valid major versions
ntoda
parents: 24604
diff changeset
  2775
        int maxMinor = Version.MAX().minor;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2776
        if (majorVersion > maxMajor ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  2777
            majorVersion * 1000 + minorVersion <
35810
9ee6e90d679c 8148808: javac, remove unused options, step 1
vromero
parents: 34560
diff changeset
  2778
            Version.MIN().major * 1000 + Version.MIN().minor) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2779
            if (majorVersion == (maxMajor + 1))
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2780
                log.warning(Warnings.BigMajorVersion(currentClassFile,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2781
                                                     majorVersion,
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 44183
diff changeset
  2782
                                                     maxMajor));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2783
            else
06bc494ca11e Initial load
duke
parents:
diff changeset
  2784
                throw badClassFile("wrong.version",
06bc494ca11e Initial load
duke
parents:
diff changeset
  2785
                                   Integer.toString(majorVersion),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2786
                                   Integer.toString(minorVersion),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2787
                                   Integer.toString(maxMajor),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2788
                                   Integer.toString(maxMinor));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2789
        }
35810
9ee6e90d679c 8148808: javac, remove unused options, step 1
vromero
parents: 34560
diff changeset
  2790
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2791
        if (minorVersion == ClassFile.PREVIEW_MINOR_VERSION) {
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2792
            if (!preview.isEnabled()) {
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2793
                log.error(preview.disabledError(currentClassFile, majorVersion));
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2794
            } else {
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2795
                preview.warnPreview(c.classfile, majorVersion);
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2796
            }
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2797
        }
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 49197
diff changeset
  2798
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2799
        indexPool();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2800
        if (signatureBuffer.length < bp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2801
            int ns = Integer.highestOneBit(bp) << 1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2802
            signatureBuffer = new byte[ns];
06bc494ca11e Initial load
duke
parents:
diff changeset
  2803
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2804
        readClass(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2805
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2806
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2807
    public void readClassFile(ClassSymbol c) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2808
        currentOwner = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2809
        currentClassFile = c.classfile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2810
        warnedAttrs.clear();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2811
        filling = true;
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2812
        target = null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2813
        repeatable = null;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2814
        try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2815
            bp = 0;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2816
            buf = readInputStream(buf, c.classfile.openInputStream());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2817
            readClassBuffer(c);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2818
            if (!missingTypeVariables.isEmpty() && !foundTypeVariables.isEmpty()) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2819
                List<Type> missing = missingTypeVariables;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2820
                List<Type> found = foundTypeVariables;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2821
                missingTypeVariables = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2822
                foundTypeVariables = List.nil();
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2823
                interimUses = List.nil();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  2824
                interimProvides = List.nil();
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2825
                filling = false;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2826
                ClassType ct = (ClassType)currentOwner.type;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2827
                ct.supertype_field =
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2828
                    types.subst(ct.supertype_field, missing, found);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2829
                ct.interfaces_field =
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2830
                    types.subst(ct.interfaces_field, missing, found);
41935
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2831
                ct.typarams_field =
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2832
                    types.substBounds(ct.typarams_field, missing, found);
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2833
                for (List<Type> types = ct.typarams_field; types.nonEmpty(); types = types.tail) {
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2834
                    types.head.tsym.type = types.head;
b1f606fff3ff 8166635: getEnclosedElements() on package causes BadClassFile error
jlahoda
parents: 41637
diff changeset
  2835
                }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2836
            } else if (missingTypeVariables.isEmpty() !=
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2837
                       foundTypeVariables.isEmpty()) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2838
                Name name = missingTypeVariables.head.tsym.name;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2839
                throw badClassFile("undecl.type.var", name);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2840
            }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2841
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2842
            if ((c.flags_field & Flags.ANNOTATION) != 0) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2843
                c.setAnnotationTypeMetadata(new AnnotationTypeMetadata(c, new CompleterDeproxy(c, target, repeatable)));
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2844
            } else {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2845
                c.setAnnotationTypeMetadata(AnnotationTypeMetadata.notAnAnnotationType());
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  2846
            }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2847
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2848
            if (c == currentModule.module_info) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2849
                if (interimUses.nonEmpty() || interimProvides.nonEmpty()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2850
                    Assert.check(currentModule.isCompleted());
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2851
                    currentModule.usesProvidesCompleter =
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2852
                            new UsesProvidesCompleter(currentModule, interimUses, interimProvides);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2853
                } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2854
                    currentModule.uses = List.nil();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2855
                    currentModule.provides = List.nil();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2856
                }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2857
            }
43268
12436ebea906 8147414: java.nio.file.ClosedFileSystemException in javadoc
jjg
parents: 42973
diff changeset
  2858
        } catch (IOException | ClosedFileSystemException ex) {
12436ebea906 8147414: java.nio.file.ClosedFileSystemException in javadoc
jjg
parents: 42973
diff changeset
  2859
            throw badClassFile("unable.to.access.file", ex.toString());
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2860
        } catch (ArrayIndexOutOfBoundsException ex) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2861
            throw badClassFile("bad.class.file", c.flatname);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2862
        } finally {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2863
            interimUses = List.nil();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2864
            interimProvides = List.nil();
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2865
            missingTypeVariables = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2866
            foundTypeVariables = List.nil();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2867
            filling = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2868
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2869
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2870
    // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  2871
        private static byte[] readInputStream(byte[] buf, InputStream s) throws IOException {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2872
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2873
                buf = ensureCapacity(buf, s.available());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2874
                int r = s.read(buf);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2875
                int bp = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2876
                while (r != -1) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2877
                    bp += r;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2878
                    buf = ensureCapacity(buf, bp);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2879
                    r = s.read(buf, bp, buf.length - bp);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2880
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2881
                return buf;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2882
            } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2883
                try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2884
                    s.close();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2885
                } catch (IOException e) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2886
                    /* Ignore any errors, as this stream may have already
06bc494ca11e Initial load
duke
parents:
diff changeset
  2887
                     * thrown a related exception which is the one that
06bc494ca11e Initial load
duke
parents:
diff changeset
  2888
                     * should be reported.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2889
                     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2890
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2891
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2892
        }
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2893
        /*
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2894
         * ensureCapacity will increase the buffer as needed, taking note that
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2895
         * the new buffer will always be greater than the needed and never
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2896
         * 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
  2897
         * will infinitely loop as buf.length - bp == 0.
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2898
         */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2899
        private static byte[] ensureCapacity(byte[] buf, int needed) {
7842
5de9ea98089d 6567415: Neverending loop in ClassReader
ksrini
parents: 7643
diff changeset
  2900
            if (buf.length <= needed) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2901
                byte[] old = buf;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2902
                buf = new byte[Integer.highestOneBit(needed) << 1];
06bc494ca11e Initial load
duke
parents:
diff changeset
  2903
                System.arraycopy(old, 0, buf, 0, old.length);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2904
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2905
            return buf;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2906
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2907
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2908
    /** We can only read a single class file at a time; this
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2909
     *  flag keeps track of when we are currently reading a class
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2910
     *  file.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2911
     */
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2912
    public boolean filling = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2913
06bc494ca11e Initial load
duke
parents:
diff changeset
  2914
/************************************************************************
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2915
 * Adjusting flags
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2916
 ***********************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2917
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2918
    long adjustFieldFlags(long flags) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2919
        return flags;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2920
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2921
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2922
    long adjustMethodFlags(long flags) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2923
        if ((flags & ACC_BRIDGE) != 0) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2924
            flags &= ~ACC_BRIDGE;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2925
            flags |= BRIDGE;
24298
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2926
        }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2927
        if ((flags & ACC_VARARGS) != 0) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2928
            flags &= ~ACC_VARARGS;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2929
            flags |= VARARGS;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2930
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2931
        return flags;
24298
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2932
    }
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2933
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2934
    long adjustClassFlags(long flags) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2935
        if ((flags & ACC_MODULE) != 0) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2936
            flags &= ~ACC_MODULE;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2937
            flags |= MODULE;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  2938
        }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents: 24403
diff changeset
  2939
        return flags & ~ACC_SUPER; // SUPER and SYNCHRONIZED bits overloaded
24298
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2940
    }
cc4f0f71a505 8028196: Javac allows timestamps inside rt.jar to affect compilation when using -sourcepath.
alundblad
parents: 24068
diff changeset
  2941
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2942
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  2943
     * A subclass of JavaFileObject for the sourcefile attribute found in a classfile.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2944
     * The attribute is only the last component of the original filename, so is unlikely
06bc494ca11e Initial load
duke
parents:
diff changeset
  2945
     * to be valid as is, so operations other than those to access the name throw
06bc494ca11e Initial load
duke
parents:
diff changeset
  2946
     * UnsupportedOperationException
06bc494ca11e Initial load
duke
parents:
diff changeset
  2947
     */
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  2948
    private static class SourceFileObject implements JavaFileObject {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2949
06bc494ca11e Initial load
duke
parents:
diff changeset
  2950
        /** The file's name.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2951
         */
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  2952
        private final Name name;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2953
54039
fd6c13481231 8220377: Unused field SourceFileObject.flatname
cushon
parents: 51833
diff changeset
  2954
        public SourceFileObject(Name name) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2955
            this.name = name;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2956
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2957
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2958
        @Override @DefinedBy(Api.COMPILER)
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2959
        public URI toUri() {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2960
            try {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2961
                return new URI(null, name.toString(), null);
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2962
            } catch (URISyntaxException e) {
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  2963
                throw new PathFileObject.CannotCreateUriError(name.toString(), e);
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2964
            }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2965
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2966
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2967
        @Override @DefinedBy(Api.COMPILER)
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2968
        public String getName() {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2969
            return name.toString();
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2970
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2971
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2972
        @Override @DefinedBy(Api.COMPILER)
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2973
        public JavaFileObject.Kind getKind() {
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  2974
            return BaseFileManager.getKind(getName());
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2975
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2976
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2977
        @Override @DefinedBy(Api.COMPILER)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2978
        public InputStream openInputStream() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2979
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2980
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2981
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2982
        @Override @DefinedBy(Api.COMPILER)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2983
        public OutputStream openOutputStream() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2984
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2985
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2986
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2987
        @Override @DefinedBy(Api.COMPILER)
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2988
        public CharBuffer getCharContent(boolean ignoreEncodingErrors) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2989
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2990
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2991
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2992
        @Override @DefinedBy(Api.COMPILER)
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2993
        public Reader openReader(boolean ignoreEncodingErrors) {
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2994
            throw new UnsupportedOperationException();
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2995
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  2996
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  2997
        @Override @DefinedBy(Api.COMPILER)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2998
        public Writer openWriter() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2999
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3000
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3001
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  3002
        @Override @DefinedBy(Api.COMPILER)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3003
        public long getLastModified() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3004
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3005
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3006
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  3007
        @Override @DefinedBy(Api.COMPILER)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3008
        public boolean delete() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3009
            throw new UnsupportedOperationException();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3010
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3011
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3012
        @Override @DefinedBy(Api.COMPILER)
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3013
        public boolean isNameCompatible(String simpleName, JavaFileObject.Kind kind) {
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3014
            return true; // fail-safe mode
3995
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  3015
        }
73af8b6fb8bc 6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
jjg
parents: 3782
diff changeset
  3016
26266
2d24bda701dc 8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents: 25874
diff changeset
  3017
        @Override @DefinedBy(Api.COMPILER)
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3018
        public NestingKind getNestingKind() {
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3019
            return null;
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3020
        }
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3021
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3022
        @Override @DefinedBy(Api.COMPILER)
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3023
        public Modifier getAccessLevel() {
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
  3024
            return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3025
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3026
4073
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  3027
        /**
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  3028
         * Check if two file objects are equal.
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  3029
         * 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
  3030
         * 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
  3031
         * 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
  3032
         */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3033
        @Override
06bc494ca11e Initial load
duke
parents:
diff changeset
  3034
        public boolean equals(Object other) {
4073
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  3035
            if (this == other)
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  3036
                return true;
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  3037
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3038
            if (!(other instanceof SourceFileObject))
06bc494ca11e Initial load
duke
parents:
diff changeset
  3039
                return false;
4073
9788f4549740 6838467: JSR199 FileObjects don't obey general contract of equals.
jjg
parents: 3998
diff changeset
  3040
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3041
            SourceFileObject o = (SourceFileObject) other;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3042
            return name.equals(o.name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3043
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3044
06bc494ca11e Initial load
duke
parents:
diff changeset
  3045
        @Override
06bc494ca11e Initial load
duke
parents:
diff changeset
  3046
        public int hashCode() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3047
            return name.hashCode();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3048
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3049
    }
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3050
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3051
    private class CompleterDeproxy implements AnnotationTypeCompleter {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3052
        ClassSymbol proxyOn;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3053
        CompoundAnnotationProxy target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3054
        CompoundAnnotationProxy repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3055
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3056
        public CompleterDeproxy(ClassSymbol c, CompoundAnnotationProxy target,
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3057
                CompoundAnnotationProxy repeatable)
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3058
        {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3059
            this.proxyOn = c;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3060
            this.target = target;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3061
            this.repeatable = repeatable;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3062
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3063
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3064
        @Override
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3065
        public void complete(ClassSymbol sym) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3066
            Assert.check(proxyOn == sym);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3067
            Attribute.Compound theTarget = null, theRepeatable = null;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3068
            AnnotationDeproxy deproxy;
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3069
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3070
            try {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3071
                if (target != null) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3072
                    deproxy = new AnnotationDeproxy(proxyOn);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3073
                    theTarget = deproxy.deproxyCompound(target);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3074
                }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3075
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3076
                if (repeatable != null) {
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3077
                    deproxy = new AnnotationDeproxy(proxyOn);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3078
                    theRepeatable = deproxy.deproxyCompound(repeatable);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3079
                }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3080
            } catch (Exception e) {
49197
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
  3081
                throw new CompletionFailure(sym,
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
  3082
                                            ClassReader.this.diagFactory.fragment(Fragments.ExceptionMessage(e.getMessage())),
cc2673fa8c20 8187950: javax.lang.model APIs throws CompletionFailure or a subtype of CompletionFailure.
jlahoda
parents: 48826
diff changeset
  3083
                                            dcfh);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3084
            }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3085
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3086
            sym.getAnnotationTypeMetadata().setTarget(theTarget);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3087
            sym.getAnnotationTypeMetadata().setRepeatable(theRepeatable);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3088
        }
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 29551
diff changeset
  3089
    }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3090
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3091
    private class ProxyType extends Type {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3092
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3093
        private final byte[] content;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3094
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3095
        public ProxyType(byte[] content) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3096
            super(syms.noSymbol, TypeMetadata.EMPTY);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3097
            this.content = content;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3098
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3099
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3100
        @Override
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3101
        public TypeTag getTag() {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3102
            return TypeTag.NONE;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3103
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3104
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3105
        @Override
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3106
        public Type cloneWithMetadata(TypeMetadata metadata) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3107
            throw new UnsupportedOperationException();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3108
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3109
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3110
        public Type resolve() {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3111
            return sigToType(content, 0, content.length);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3112
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3113
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3114
        @Override @DefinedBy(Api.LANGUAGE_MODEL)
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3115
        public String toString() {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3116
            return "<ProxyType>";
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3117
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3118
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3119
    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3120
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3121
    private static final class InterimUsesDirective {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3122
        public final Name service;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3123
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3124
        public InterimUsesDirective(Name service) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3125
            this.service = service;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3126
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3127
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3128
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3129
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3130
    private static final class InterimProvidesDirective {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3131
        public final Name service;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3132
        public final List<Name> impls;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3133
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3134
        public InterimProvidesDirective(Name service, List<Name> impls) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3135
            this.service = service;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3136
            this.impls = impls;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3137
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3138
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3139
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3140
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3141
    private final class UsesProvidesCompleter implements Completer {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3142
        private final ModuleSymbol currentModule;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3143
        private final List<InterimUsesDirective> interimUsesCopy;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3144
        private final List<InterimProvidesDirective> interimProvidesCopy;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3145
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3146
        public UsesProvidesCompleter(ModuleSymbol currentModule, List<InterimUsesDirective> interimUsesCopy, List<InterimProvidesDirective> interimProvidesCopy) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3147
            this.currentModule = currentModule;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3148
            this.interimUsesCopy = interimUsesCopy;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3149
            this.interimProvidesCopy = interimProvidesCopy;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3150
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3151
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3152
        @Override
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3153
        public void complete(Symbol sym) throws CompletionFailure {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3154
            ListBuffer<Directive> directives = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3155
            directives.addAll(currentModule.directives);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3156
            ListBuffer<UsesDirective> uses = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3157
            for (InterimUsesDirective interim : interimUsesCopy) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3158
                UsesDirective d = new UsesDirective(syms.enterClass(currentModule, interim.service));
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3159
                uses.add(d);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3160
                directives.add(d);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3161
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3162
            currentModule.uses = uses.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3163
            ListBuffer<ProvidesDirective> provides = new ListBuffer<>();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3164
            for (InterimProvidesDirective interim : interimProvidesCopy) {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3165
                ListBuffer<ClassSymbol> impls = new ListBuffer<>();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3166
                for (Name impl : interim.impls) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3167
                    impls.append(syms.enterClass(currentModule, impl));
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3168
                }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3169
                ProvidesDirective d = new ProvidesDirective(syms.enterClass(currentModule, interim.service),
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41991
diff changeset
  3170
                                                            impls.toList());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3171
                provides.add(d);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3172
                directives.add(d);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3173
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3174
            currentModule.provides = provides.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3175
            currentModule.directives = directives.toList();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3176
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 35810
diff changeset
  3177
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3178
}