langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
author jlahoda
Thu, 15 Jun 2017 13:44:42 +0200
changeset 45504 ea7475564d07
parent 43772 4e5350b7be75
child 45910 c7092e4591b2
permissions -rw-r--r--
8170326: Inconsistencies between code, compiler.properties and comments Summary: Converting uses of Log and JCDiagnostic.Factory methods to use CompilerProperties instead of plain Strings, fixing inconsistencies, adding crules analyzer to ensure CompilerProperties are used whenever possible. Reviewed-by: mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     1
/*
36492
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
     2
 * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     4
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    10
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    15
 * accompanied this code).
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    16
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    20
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    23
 * questions.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    24
 */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    25
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    26
package com.sun.tools.javac.code;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    27
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27858
diff changeset
    28
import java.io.IOException;
36492
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
    29
import java.nio.file.Path;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    30
import java.util.EnumSet;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    31
import java.util.HashMap;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
    32
import java.util.Iterator;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    33
import java.util.Map;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
    34
import java.util.NoSuchElementException;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    35
import java.util.Set;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    36
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    37
import javax.lang.model.SourceVersion;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    38
import javax.tools.JavaFileManager;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    39
import javax.tools.JavaFileManager.Location;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    40
import javax.tools.JavaFileObject;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
    41
import javax.tools.JavaFileObject.Kind;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    42
import javax.tools.StandardJavaFileManager;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
    43
import javax.tools.StandardLocation;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    44
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
    45
import com.sun.tools.javac.code.Scope.WriteableScope;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    46
import com.sun.tools.javac.code.Symbol.ClassSymbol;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    47
import com.sun.tools.javac.code.Symbol.Completer;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    48
import com.sun.tools.javac.code.Symbol.CompletionFailure;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
    49
import com.sun.tools.javac.code.Symbol.ModuleSymbol;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    50
import com.sun.tools.javac.code.Symbol.PackageSymbol;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    51
import com.sun.tools.javac.code.Symbol.TypeSymbol;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    52
import com.sun.tools.javac.comp.Annotate;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    53
import com.sun.tools.javac.file.JRTIndex;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    54
import com.sun.tools.javac.file.JavacFileManager;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    55
import com.sun.tools.javac.jvm.ClassReader;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    56
import com.sun.tools.javac.jvm.Profile;
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 37001
diff changeset
    57
import com.sun.tools.javac.main.Option;
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
    58
import com.sun.tools.javac.platform.PlatformDescription;
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
    59
import com.sun.tools.javac.resources.CompilerProperties.Fragments;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    60
import com.sun.tools.javac.util.*;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    61
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    62
import static javax.tools.StandardLocation.*;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
    63
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    64
import static com.sun.tools.javac.code.Flags.*;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
    65
import static com.sun.tools.javac.code.Kinds.Kind.*;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    66
27857
7e913a535736 7101822: Compiling depends on order of imports
jlahoda
parents: 27224
diff changeset
    67
import com.sun.tools.javac.util.Dependencies.CompletionCause;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    68
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    69
/**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    70
 *  This class provides operations to locate class definitions
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    71
 *  from the source and class files on the paths provided to javac.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    72
 *
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    73
 *  <p><b>This is NOT part of any supported API.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    74
 *  If you write code that depends on this, you do so at your own risk.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    75
 *  This code and its internal interfaces are subject to change or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    76
 *  deletion without notice.</b>
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    77
 */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    78
public class ClassFinder {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    79
    /** The context key for the class finder. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    80
    protected static final Context.Key<ClassFinder> classFinderKey = new Context.Key<>();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    81
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    82
    ClassReader reader;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    83
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27858
diff changeset
    84
    private final Annotate annotate;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    85
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    86
    /** Switch: verbose output.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    87
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    88
    boolean verbose;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    89
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    90
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    91
     * Switch: cache completion failures unless -XDdev is used
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    92
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    93
    private boolean cacheCompletionFailure;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    94
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    95
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    96
     * Switch: prefer source files instead of newer when both source
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    97
     * and class are available
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    98
     **/
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
    99
    protected boolean preferSource;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   100
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   101
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   102
     * Switch: Search classpath and sourcepath for classes before the
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   103
     * bootclasspath
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   104
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   105
    protected boolean userPathsFirst;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   106
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   107
    /**
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   108
     * Switch: should read OTHER classfiles (.sig files) from PLATFORM_CLASS_PATH.
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   109
     */
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   110
    private boolean allowSigFiles;
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   111
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   112
    /** The log to use for verbose output
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   113
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   114
    final Log log;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   115
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   116
    /** The symbol table. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   117
    Symtab syms;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   118
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   119
    /** The name table. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   120
    final Names names;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   121
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   122
    /** Force a completion failure on this name
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   123
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   124
    final Name completionFailureName;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   125
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   126
    /** Access to files
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   127
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   128
    private final JavaFileManager fileManager;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   129
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   130
    /** Dependency tracker
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   131
     */
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   132
    private final Dependencies dependencies;
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   133
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   134
    /** Factory for diagnostics
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   135
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   136
    JCDiagnostic.Factory diagFactory;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   137
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   138
    /** Can be reassigned from outside:
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   139
     *  the completer to be used for ".java" files. If this remains unassigned
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   140
     *  ".java" files will not be loaded.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   141
     */
30066
d74c06a92bd8 8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents: 29842
diff changeset
   142
    public Completer sourceCompleter = Completer.NULL_COMPLETER;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   143
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   144
    /** The path name of the class file currently being read.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   145
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   146
    protected JavaFileObject currentClassFile = null;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   147
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   148
    /** The class or method currently being read.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   149
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   150
    protected Symbol currentOwner = null;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   151
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   152
    /**
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   153
     * The currently selected profile.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   154
     */
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   155
    private final Profile profile;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   156
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   157
    /**
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   158
     * Use direct access to the JRTIndex to access the temporary
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   159
     * replacement for the info that used to be in ct.sym.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   160
     * In time, this will go away and be replaced by the module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   161
     */
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   162
    private final JRTIndex jrtIndex;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   163
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   164
    /**
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   165
     * Completer that delegates to the complete-method of this class.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   166
     */
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42407
diff changeset
   167
    private final Completer thisCompleter = this::complete;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   168
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   169
    public Completer getCompleter() {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   170
        return thisCompleter;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   171
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   172
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   173
    /** Get the ClassFinder instance for this invocation. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   174
    public static ClassFinder instance(Context context) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   175
        ClassFinder instance = context.get(classFinderKey);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   176
        if (instance == null)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   177
            instance = new ClassFinder(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   178
        return instance;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   179
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   180
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   181
    /** Construct a new class finder. */
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   182
    protected ClassFinder(Context context) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   183
        context.put(classFinderKey, this);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   184
        reader = ClassReader.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   185
        names = Names.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   186
        syms = Symtab.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   187
        fileManager = context.get(JavaFileManager.class);
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   188
        dependencies = Dependencies.instance(context);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   189
        if (fileManager == null)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   190
            throw new AssertionError("FileManager initialization error");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   191
        diagFactory = JCDiagnostic.Factory.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   192
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   193
        log = Log.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   194
        annotate = Annotate.instance(context);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   195
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   196
        Options options = Options.instance(context);
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 37001
diff changeset
   197
        verbose = options.isSet(Option.VERBOSE);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   198
        cacheCompletionFailure = options.isUnset("dev");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   199
        preferSource = "source".equals(options.get("-Xprefer"));
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 37001
diff changeset
   200
        userPathsFirst = options.isSet(Option.XXUSERPATHSFIRST);
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   201
        allowSigFiles = context.get(PlatformDescription.class) != null;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   202
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   203
        completionFailureName =
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   204
            options.isSet("failcomplete")
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   205
            ? names.fromString(options.get("failcomplete"))
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   206
            : null;
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   207
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   208
        // Temporary, until more info is available from the module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   209
        boolean useCtProps;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   210
        JavaFileManager fm = context.get(JavaFileManager.class);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   211
        if (fm instanceof JavacFileManager) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   212
            JavacFileManager jfm = (JavacFileManager) fm;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   213
            useCtProps = jfm.isDefaultBootClassPath() && jfm.isSymbolFileEnabled();
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   214
        } else if (fm.getClass().getName().equals("com.sun.tools.sjavac.comp.SmartFileManager")) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   215
            useCtProps = !options.isSet("ignore.symbol.file");
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   216
        } else {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   217
            useCtProps = false;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   218
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   219
        jrtIndex = useCtProps && JRTIndex.isAvailable() ? JRTIndex.getSharedInstance() : null;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   220
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   221
        profile = Profile.instance(context);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   222
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   223
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   224
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   225
/************************************************************************
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   226
 * Temporary ct.sym replacement
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   227
 *
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   228
 * The following code is a temporary substitute for the ct.sym mechanism
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   229
 * used in JDK 6 thru JDK 8.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   230
 * This mechanism will eventually be superseded by the Jigsaw module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   231
 ***********************************************************************/
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   232
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   233
    /**
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   234
     * Returns any extra flags for a class symbol.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   235
     * This information used to be provided using private annotations
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   236
     * in the class file in ct.sym; in time, this information will be
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   237
     * available from the module system.
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   238
     */
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   239
    long getSupplementaryFlags(ClassSymbol c) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   240
        if (jrtIndex == null || !jrtIndex.isInJRT(c.classfile) || c.name == names.module_info) {
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   241
            return 0;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   242
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   243
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   244
        if (supplementaryFlags == null) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   245
            supplementaryFlags = new HashMap<>();
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   246
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   247
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   248
        Long flags = supplementaryFlags.get(c.packge());
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   249
        if (flags == null) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   250
            long newFlags = 0;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   251
            try {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   252
                JRTIndex.CtSym ctSym = jrtIndex.getCtSym(c.packge().flatName());
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   253
                Profile minProfile = Profile.DEFAULT;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   254
                if (ctSym.proprietary)
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   255
                    newFlags |= PROPRIETARY;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   256
                if (ctSym.minProfile != null)
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   257
                    minProfile = Profile.lookup(ctSym.minProfile);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   258
                if (profile != Profile.DEFAULT && minProfile.value > profile.value) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   259
                    newFlags |= NOT_IN_PROFILE;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   260
                }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   261
            } catch (IOException ignore) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   262
            }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   263
            supplementaryFlags.put(c.packge(), flags = newFlags);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   264
        }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   265
        return flags;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   266
    }
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   267
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   268
    private Map<PackageSymbol, Long> supplementaryFlags;
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   269
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   270
/************************************************************************
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   271
 * Loading Classes
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   272
 ***********************************************************************/
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   273
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   274
    /** Completion for classes to be loaded. Before a class is loaded
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   275
     *  we make sure its enclosing class (if any) is loaded.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   276
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   277
    private void complete(Symbol sym) throws CompletionFailure {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   278
        if (sym.kind == TYP) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   279
            try {
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   280
                ClassSymbol c = (ClassSymbol) sym;
27857
7e913a535736 7101822: Compiling depends on order of imports
jlahoda
parents: 27224
diff changeset
   281
                dependencies.push(c, CompletionCause.CLASS_READER);
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27858
diff changeset
   282
                annotate.blockAnnotations();
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   283
                c.members_field = new Scope.ErrorScope(c); // make sure it's always defined
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27858
diff changeset
   284
                completeOwners(c.owner);
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27858
diff changeset
   285
                completeEnclosing(c);
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   286
                fillIn(c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   287
            } finally {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27858
diff changeset
   288
                annotate.unblockAnnotationsNoFlush();
25844
48eab270456c 8048890: Add option to keep track of symbol completion dependencies
mcimadamore
parents: 25443
diff changeset
   289
                dependencies.pop();
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   290
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   291
        } else if (sym.kind == PCK) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   292
            PackageSymbol p = (PackageSymbol)sym;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   293
            try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   294
                fillIn(p);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   295
            } catch (IOException ex) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
   296
                JCDiagnostic msg =
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
   297
                        diagFactory.fragment(Fragments.ExceptionMessage(ex.getLocalizedMessage()));
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
   298
                throw new CompletionFailure(sym, msg).initCause(ex);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   299
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   300
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   301
        if (!reader.filling)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   302
            annotate.flush(); // finish attaching annotations
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   303
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   304
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   305
    /** complete up through the enclosing package. */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   306
    private void completeOwners(Symbol o) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   307
        if (o.kind != PCK) completeOwners(o.owner);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   308
        o.complete();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   309
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   310
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   311
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   312
     * Tries to complete lexically enclosing classes if c looks like a
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   313
     * nested class.  This is similar to completeOwners but handles
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   314
     * the situation when a nested class is accessed directly as it is
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   315
     * possible with the Tree API or javax.lang.model.*.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   316
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   317
    private void completeEnclosing(ClassSymbol c) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   318
        if (c.owner.kind == PCK) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   319
            Symbol owner = c.owner;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   320
            for (Name name : Convert.enclosingCandidates(Convert.shortName(c.name))) {
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
   321
                Symbol encl = owner.members().findFirst(name);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   322
                if (encl == null)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   323
                    encl = syms.getClass(c.packge().modle, TypeSymbol.formFlatName(name, owner));
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   324
                if (encl != null)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   325
                    encl.complete();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   326
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   327
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   328
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   329
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   330
    /** Fill in definition of class `c' from corresponding class or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   331
     *  source file.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   332
     */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   333
    void fillIn(ClassSymbol c) {
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   334
        if (completionFailureName == c.fullname) {
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
   335
            JCDiagnostic msg =
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
   336
                    diagFactory.fragment(Fragments.UserSelectedCompletionFailure);
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
   337
            throw new CompletionFailure(c, msg);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   338
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   339
        currentOwner = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   340
        JavaFileObject classfile = c.classfile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   341
        if (classfile != null) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   342
            JavaFileObject previousClassFile = currentClassFile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   343
            try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   344
                if (reader.filling) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   345
                    Assert.error("Filling " + classfile.toUri() + " during " + previousClassFile);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   346
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   347
                currentClassFile = classfile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   348
                if (verbose) {
34560
b6a567b677f7 8059976: Convert JavacFileManager to use java.nio.file internally
jjg
parents: 31506
diff changeset
   349
                    log.printVerbose("loading", currentClassFile.getName());
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   350
                }
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   351
                if (classfile.getKind() == JavaFileObject.Kind.CLASS ||
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   352
                    classfile.getKind() == JavaFileObject.Kind.OTHER) {
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   353
                    reader.readClassFile(c);
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   354
                    c.flags_field |= getSupplementaryFlags(c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   355
                } else {
30066
d74c06a92bd8 8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents: 29842
diff changeset
   356
                    if (!sourceCompleter.isTerminal()) {
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   357
                        sourceCompleter.complete(c);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   358
                    } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   359
                        throw new IllegalStateException("Source completer required to read "
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   360
                                                        + classfile.toUri());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   361
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   362
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   363
            } finally {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   364
                currentClassFile = previousClassFile;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   365
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   366
        } else {
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   367
            throw classFileNotFound(c);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   368
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   369
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   370
    // where
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   371
        private CompletionFailure classFileNotFound(ClassSymbol c) {
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   372
            JCDiagnostic diag =
45504
ea7475564d07 8170326: Inconsistencies between code, compiler.properties and comments
jlahoda
parents: 43772
diff changeset
   373
                diagFactory.fragment(Fragments.ClassFileNotFound(c.flatname));
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   374
            return newCompletionFailure(c, diag);
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   375
        }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   376
        /** Static factory for CompletionFailure objects.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   377
         *  In practice, only one can be used at a time, so we share one
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   378
         *  to reduce the expense of allocating new exception objects.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   379
         */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   380
        private CompletionFailure newCompletionFailure(TypeSymbol c,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   381
                                                       JCDiagnostic diag) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   382
            if (!cacheCompletionFailure) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   383
                // log.warning("proc.messager",
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   384
                //             Log.getLocalizedString("class.file.not.found", c.flatname));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   385
                // c.debug.printStackTrace();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   386
                return new CompletionFailure(c, diag);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   387
            } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   388
                CompletionFailure result = cachedCompletionFailure;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   389
                result.sym = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   390
                result.diag = diag;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   391
                return result;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   392
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   393
        }
27579
d1a63c99cdd5 8049367: Modular Run-Time Images
chegar
parents: 27224
diff changeset
   394
        private final CompletionFailure cachedCompletionFailure =
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   395
            new CompletionFailure(null, (JCDiagnostic) null);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   396
        {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   397
            cachedCompletionFailure.setStackTrace(new StackTraceElement[0]);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   398
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   399
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   400
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   401
    /** Load a toplevel class with given fully qualified name
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   402
     *  The class is entered into `classes' only if load was successful.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   403
     */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   404
    public ClassSymbol loadClass(ModuleSymbol msym, Name flatname) throws CompletionFailure {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   405
        Assert.checkNonNull(msym);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   406
        Name packageName = Convert.packagePart(flatname);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   407
        PackageSymbol ps = syms.lookupPackage(msym, packageName);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   408
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   409
        Assert.checkNonNull(ps.modle, () -> "msym=" + msym + "; flatName=" + flatname);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   410
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   411
        boolean absent = syms.getClass(ps.modle, flatname) == null;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   412
        ClassSymbol c = syms.enterClass(ps.modle, flatname);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   413
30066
d74c06a92bd8 8078600: Infinite loop when compiling annotations with -XDcompletionDeps
alundblad
parents: 29842
diff changeset
   414
        if (c.members_field == null) {
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   415
            try {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   416
                c.complete();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   417
            } catch (CompletionFailure ex) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   418
                if (absent) syms.removeClass(ps.modle, flatname);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   419
                throw ex;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   420
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   421
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   422
        return c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   423
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   424
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   425
/************************************************************************
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   426
 * Loading Packages
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   427
 ***********************************************************************/
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   428
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   429
    /** Include class corresponding to given class file in package,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   430
     *  unless (1) we already have one the same kind (.class or .java), or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   431
     *         (2) we have one of the other kind, and the given class file
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   432
     *             is older.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   433
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   434
    protected void includeClassFile(PackageSymbol p, JavaFileObject file) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   435
        if ((p.flags_field & EXISTS) == 0)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   436
            for (Symbol q = p; q != null && q.kind == PCK; q = q.owner)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   437
                q.flags_field |= EXISTS;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   438
        JavaFileObject.Kind kind = file.getKind();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   439
        int seen;
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   440
        if (kind == JavaFileObject.Kind.CLASS || kind == JavaFileObject.Kind.OTHER)
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   441
            seen = CLASS_SEEN;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   442
        else
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   443
            seen = SOURCE_SEEN;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   444
        String binaryName = fileManager.inferBinaryName(currentLoc, file);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   445
        int lastDot = binaryName.lastIndexOf(".");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   446
        Name classname = names.fromString(binaryName.substring(lastDot + 1));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   447
        boolean isPkgInfo = classname == names.package_info;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   448
        ClassSymbol c = isPkgInfo
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   449
            ? p.package_info
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
   450
            : (ClassSymbol) p.members_field.findFirst(classname);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   451
        if (c == null) {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   452
            c = syms.enterClass(p.modle, classname, p);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   453
            if (c.classfile == null) // only update the file if's it's newly created
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   454
                c.classfile = file;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   455
            if (isPkgInfo) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   456
                p.package_info = c;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   457
            } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   458
                if (c.owner == p)  // it might be an inner class
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   459
                    p.members_field.enter(c);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   460
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   461
        } else if (!preferCurrent && c.classfile != null && (c.flags_field & seen) == 0) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   462
            // if c.classfile == null, we are currently compiling this class
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   463
            // and no further action is necessary.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   464
            // if (c.flags_field & seen) != 0, we have already encountered
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   465
            // a file of the same kind; again no further action is necessary.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   466
            if ((c.flags_field & (CLASS_SEEN | SOURCE_SEEN)) != 0)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   467
                c.classfile = preferredFileObject(file, c.classfile);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   468
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   469
        c.flags_field |= seen;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   470
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   471
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   472
    /** Implement policy to choose to derive information from a source
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   473
     *  file or a class file when both are present.  May be overridden
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   474
     *  by subclasses.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   475
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   476
    protected JavaFileObject preferredFileObject(JavaFileObject a,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   477
                                           JavaFileObject b) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   478
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   479
        if (preferSource)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   480
            return (a.getKind() == JavaFileObject.Kind.SOURCE) ? a : b;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   481
        else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   482
            long adate = a.getLastModified();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   483
            long bdate = b.getLastModified();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   484
            // 6449326: policy for bad lastModifiedTime in ClassReader
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   485
            //assert adate >= 0 && bdate >= 0;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   486
            return (adate > bdate) ? a : b;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   487
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   488
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   489
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   490
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   491
     * specifies types of files to be read when filling in a package symbol
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   492
     */
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   493
    // Note: overridden by JavadocClassFinder
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   494
    protected EnumSet<JavaFileObject.Kind> getPackageFileKinds() {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   495
        return EnumSet.of(JavaFileObject.Kind.CLASS, JavaFileObject.Kind.SOURCE);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   496
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   497
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   498
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   499
     * this is used to support javadoc
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   500
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   501
    protected void extraFileActions(PackageSymbol pack, JavaFileObject fe) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   502
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   503
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   504
    protected Location currentLoc; // FIXME
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   505
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   506
    private boolean verbosePath = true;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   507
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   508
    // Set to true when the currently selected file should be kept
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   509
    private boolean preferCurrent;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   510
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   511
    /** Load directory of package into members scope.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   512
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   513
    private void fillIn(PackageSymbol p) throws IOException {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   514
        if (p.members_field == null)
25443
9187d77f2c64 8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents: 24604
diff changeset
   515
            p.members_field = WriteableScope.create(p);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   516
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   517
        ModuleSymbol msym = p.modle;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   518
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42407
diff changeset
   519
        Assert.checkNonNull(msym, p::toString);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   520
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   521
        msym.complete();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   522
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   523
        if (msym == syms.noModule) {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   524
            preferCurrent = false;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   525
            if (userPathsFirst) {
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   526
                scanUserPaths(p, true);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   527
                preferCurrent = true;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   528
                scanPlatformPath(p);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   529
            } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   530
                scanPlatformPath(p);
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   531
                scanUserPaths(p, true);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   532
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   533
        } else if (msym.classLocation == StandardLocation.CLASS_PATH) {
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   534
            scanUserPaths(p, msym.sourceLocation == StandardLocation.SOURCE_PATH);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   535
        } else {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   536
            scanModulePaths(p, msym);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   537
        }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   538
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   539
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   540
    // TODO: for now, this is a much simplified form of scanUserPaths
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   541
    // and (deliberately) does not default sourcepath to classpath.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   542
    // But, we need to think about retaining existing behavior for
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   543
    // -classpath and -sourcepath for single module mode.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   544
    // One plausible solution is to detect if the module's sourceLocation
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   545
    // is the same as the module's classLocation.
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   546
    private void scanModulePaths(PackageSymbol p, ModuleSymbol msym) throws IOException {
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   547
        Set<JavaFileObject.Kind> kinds = getPackageFileKinds();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   548
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   549
        Set<JavaFileObject.Kind> classKinds = EnumSet.copyOf(kinds);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   550
        classKinds.remove(JavaFileObject.Kind.SOURCE);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   551
        boolean wantClassFiles = !classKinds.isEmpty();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   552
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   553
        Set<JavaFileObject.Kind> sourceKinds = EnumSet.copyOf(kinds);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   554
        sourceKinds.remove(JavaFileObject.Kind.CLASS);
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   555
        boolean wantSourceFiles = !sourceKinds.isEmpty();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   556
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   557
        String packageName = p.fullname.toString();
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   558
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   559
        Location classLocn = msym.classLocation;
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   560
        Location sourceLocn = msym.sourceLocation;
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   561
        Location patchLocn = msym.patchLocation;
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   562
        Location patchOutLocn = msym.patchOutputLocation;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   563
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   564
        boolean prevPreferCurrent = preferCurrent;
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   565
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   566
        try {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   567
            preferCurrent = false;
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   568
            if (wantClassFiles && (patchOutLocn != null)) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   569
                fillIn(p, patchOutLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   570
                       list(patchOutLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   571
                            p,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   572
                            packageName,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   573
                            classKinds));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   574
            }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   575
            if ((wantClassFiles || wantSourceFiles) && (patchLocn != null)) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   576
                Set<JavaFileObject.Kind> combined = EnumSet.noneOf(JavaFileObject.Kind.class);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   577
                combined.addAll(classKinds);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   578
                combined.addAll(sourceKinds);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   579
                fillIn(p, patchLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   580
                       list(patchLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   581
                            p,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   582
                            packageName,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   583
                            combined));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   584
            }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   585
            preferCurrent = true;
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   586
            if (wantClassFiles && (classLocn != null)) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   587
                fillIn(p, classLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   588
                       list(classLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   589
                            p,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   590
                            packageName,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   591
                            classKinds));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   592
            }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   593
            if (wantSourceFiles && (sourceLocn != null)) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   594
                fillIn(p, sourceLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   595
                       list(sourceLocn,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   596
                            p,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   597
                            packageName,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   598
                            sourceKinds));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   599
            }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   600
        } finally {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42827
diff changeset
   601
            preferCurrent = prevPreferCurrent;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents: 36492
diff changeset
   602
        }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   603
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   605
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   606
     * Scans class path and source path for files in given package.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   607
     */
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   608
    private void scanUserPaths(PackageSymbol p, boolean includeSourcePath) throws IOException {
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   609
        Set<JavaFileObject.Kind> kinds = getPackageFileKinds();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   610
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   611
        Set<JavaFileObject.Kind> classKinds = EnumSet.copyOf(kinds);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   612
        classKinds.remove(JavaFileObject.Kind.SOURCE);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   613
        boolean wantClassFiles = !classKinds.isEmpty();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   614
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   615
        Set<JavaFileObject.Kind> sourceKinds = EnumSet.copyOf(kinds);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   616
        sourceKinds.remove(JavaFileObject.Kind.CLASS);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   617
        boolean wantSourceFiles = !sourceKinds.isEmpty();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   618
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   619
        boolean haveSourcePath = includeSourcePath && fileManager.hasLocation(SOURCE_PATH);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   620
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   621
        if (verbose && verbosePath) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   622
            if (fileManager instanceof StandardJavaFileManager) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   623
                StandardJavaFileManager fm = (StandardJavaFileManager)fileManager;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   624
                if (haveSourcePath && wantSourceFiles) {
36492
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   625
                    List<Path> path = List.nil();
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   626
                    for (Path sourcePath : fm.getLocationAsPaths(SOURCE_PATH)) {
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   627
                        path = path.prepend(sourcePath);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   628
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   629
                    log.printVerbose("sourcepath", path.reverse().toString());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   630
                } else if (wantSourceFiles) {
36492
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   631
                    List<Path> path = List.nil();
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   632
                    for (Path classPath : fm.getLocationAsPaths(CLASS_PATH)) {
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   633
                        path = path.prepend(classPath);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   634
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   635
                    log.printVerbose("sourcepath", path.reverse().toString());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   636
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   637
                if (wantClassFiles) {
36492
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   638
                    List<Path> path = List.nil();
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   639
                    for (Path platformPath : fm.getLocationAsPaths(PLATFORM_CLASS_PATH)) {
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   640
                        path = path.prepend(platformPath);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   641
                    }
36492
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   642
                    for (Path classPath : fm.getLocationAsPaths(CLASS_PATH)) {
12abe038f3d9 8139474: -release 7 -verbose causes Javac exception
vromero
parents: 34560
diff changeset
   643
                        path = path.prepend(classPath);
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   644
                    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   645
                    log.printVerbose("classpath",  path.reverse().toString());
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   646
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   647
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   648
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   649
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   650
        String packageName = p.fullname.toString();
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   651
        if (wantSourceFiles && !haveSourcePath) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   652
            fillIn(p, CLASS_PATH,
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   653
                   list(CLASS_PATH,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   654
                        p,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   655
                        packageName,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   656
                        kinds));
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   657
        } else {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   658
            if (wantClassFiles)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   659
                fillIn(p, CLASS_PATH,
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   660
                       list(CLASS_PATH,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   661
                            p,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   662
                            packageName,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   663
                            classKinds));
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   664
            if (wantSourceFiles)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   665
                fillIn(p, SOURCE_PATH,
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   666
                       list(SOURCE_PATH,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   667
                            p,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   668
                            packageName,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   669
                            sourceKinds));
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   670
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   671
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   672
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   673
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   674
     * Scans platform class path for files in given package.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   675
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   676
    private void scanPlatformPath(PackageSymbol p) throws IOException {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   677
        fillIn(p, PLATFORM_CLASS_PATH,
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   678
               list(PLATFORM_CLASS_PATH,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   679
                    p,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   680
                    p.fullname.toString(),
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   681
                    allowSigFiles ? EnumSet.of(JavaFileObject.Kind.CLASS,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   682
                                               JavaFileObject.Kind.OTHER)
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   683
                                  : EnumSet.of(JavaFileObject.Kind.CLASS)));
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   684
    }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   685
    // where
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   686
        @SuppressWarnings("fallthrough")
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   687
        private void fillIn(PackageSymbol p,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   688
                            Location location,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   689
                            Iterable<JavaFileObject> files)
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   690
        {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   691
            currentLoc = location;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   692
            for (JavaFileObject fo : files) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   693
                switch (fo.getKind()) {
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   694
                case OTHER:
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   695
                    if (!isSigFile(location, fo)) {
31506
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   696
                        extraFileActions(p, fo);
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   697
                        break;
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   698
                    }
4e07f827a794 8072480: javac should support compilation for a specific platform version
jlahoda
parents: 30066
diff changeset
   699
                    //intentional fall-through:
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   700
                case CLASS:
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   701
                case SOURCE: {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   702
                    // TODO pass binaryName to includeClassFile
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   703
                    String binaryName = fileManager.inferBinaryName(currentLoc, fo);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   704
                    String simpleName = binaryName.substring(binaryName.lastIndexOf(".") + 1);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   705
                    if (SourceVersion.isIdentifier(simpleName) ||
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   706
                        simpleName.equals("package-info"))
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   707
                        includeClassFile(p, fo);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   708
                    break;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   709
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   710
                default:
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   711
                    extraFileActions(p, fo);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   712
                    break;
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   713
                }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   714
            }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   715
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   716
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   717
        boolean isSigFile(Location location, JavaFileObject fo) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   718
            return location == PLATFORM_CLASS_PATH &&
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   719
                   allowSigFiles &&
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   720
                   fo.getName().endsWith(".sig");
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   721
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   722
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   723
        Iterable<JavaFileObject> list(Location location,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   724
                                      PackageSymbol p,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   725
                                      String packageName,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   726
                                      Set<Kind> kinds) throws IOException {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   727
            Iterable<JavaFileObject> listed = fileManager.list(location,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   728
                                                               packageName,
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   729
                                                               EnumSet.allOf(Kind.class),
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   730
                                                               false);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   731
            return () -> new Iterator<JavaFileObject>() {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   732
                private final Iterator<JavaFileObject> original = listed.iterator();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   733
                private JavaFileObject next;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   734
                @Override
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   735
                public boolean hasNext() {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   736
                    if (next == null) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   737
                        while (original.hasNext()) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   738
                            JavaFileObject fo = original.next();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   739
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   740
                            if (fo.getKind() != Kind.CLASS &&
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   741
                                fo.getKind() != Kind.SOURCE &&
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   742
                                !isSigFile(currentLoc, fo)) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   743
                                p.flags_field |= Flags.HAS_RESOURCE;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   744
                            }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   745
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   746
                            if (kinds.contains(fo.getKind())) {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   747
                                next = fo;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   748
                                break;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   749
                            }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   750
                        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   751
                    }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   752
                    return next != null;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   753
                }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   754
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   755
                @Override
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   756
                public JavaFileObject next() {
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   757
                    if (!hasNext())
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   758
                        throw new NoSuchElementException();
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   759
                    JavaFileObject result = next;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   760
                    next = null;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   761
                    return result;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   762
                }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   763
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   764
            };
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   765
        }
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 40768
diff changeset
   766
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   767
    /**
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   768
     * Used for bad class definition files, such as bad .class files or
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   769
     * for .java files with unexpected package or class names.
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   770
     */
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   771
    public static class BadClassFile extends CompletionFailure {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   772
        private static final long serialVersionUID = 0;
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   773
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   774
        public BadClassFile(TypeSymbol sym, JavaFileObject file, JCDiagnostic diag,
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   775
                JCDiagnostic.Factory diagFactory) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   776
            super(sym, createBadClassFileDiagnostic(file, diag, diagFactory));
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   777
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   778
        // where
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   779
        private static JCDiagnostic createBadClassFileDiagnostic(
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   780
                JavaFileObject file, JCDiagnostic diag, JCDiagnostic.Factory diagFactory) {
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   781
            String key = (file.getKind() == JavaFileObject.Kind.SOURCE
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   782
                        ? "bad.source.file.header" : "bad.class.file.header");
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   783
            return diagFactory.fragment(key, file, diag);
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   784
        }
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   785
    }
37001
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   786
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   787
    public static class BadEnclosingMethodAttr extends BadClassFile {
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   788
        private static final long serialVersionUID = 0;
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   789
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   790
        public BadEnclosingMethodAttr(TypeSymbol sym, JavaFileObject file, JCDiagnostic diag,
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   791
                JCDiagnostic.Factory diagFactory) {
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   792
            super(sym, file, diag, diagFactory);
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   793
        }
594b4565d8a4 8151191: javac error when running javadoc on some inner classes
vromero
parents: 36526
diff changeset
   794
    }
24604
7f68545b5128 8041422: Split javac ClassReader into ClassReader+ClassFinder
jjg
parents:
diff changeset
   795
}