langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
author vromero
Sat, 14 Sep 2013 19:04:47 +0100
changeset 19941 8b91e8eb2d20
parent 19927 8793c5627ba7
child 20249 93f8eae31092
permissions -rw-r--r--
7047734: javac, the LVT is not generated correctly in several scenarios Reviewed-by: jjg, mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14721
diff changeset
     2
 * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4871
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4871
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4871
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4871
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 4871
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
06bc494ca11e Initial load
duke
parents:
diff changeset
    26
package com.sun.tools.javac.comp;
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
06bc494ca11e Initial load
duke
parents:
diff changeset
    28
import java.util.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    29
06bc494ca11e Initial load
duke
parents:
diff changeset
    30
import com.sun.tools.javac.code.*;
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
    31
import com.sun.tools.javac.code.Type.AnnotatedType;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    32
import com.sun.tools.javac.jvm.*;
11314
b612aaca08d0 7120736: refactor javac option handling
jjg
parents: 11055
diff changeset
    33
import com.sun.tools.javac.main.Option.PkgInfo;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    34
import com.sun.tools.javac.tree.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    35
import com.sun.tools.javac.util.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    36
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
06bc494ca11e Initial load
duke
parents:
diff changeset
    37
import com.sun.tools.javac.util.List;
06bc494ca11e Initial load
duke
parents:
diff changeset
    38
06bc494ca11e Initial load
duke
parents:
diff changeset
    39
import com.sun.tools.javac.code.Symbol.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    40
import com.sun.tools.javac.tree.JCTree.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    41
import com.sun.tools.javac.code.Type.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    42
06bc494ca11e Initial load
duke
parents:
diff changeset
    43
import com.sun.tools.javac.jvm.Target;
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12716
diff changeset
    44
import com.sun.tools.javac.tree.EndPosTable;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    45
06bc494ca11e Initial load
duke
parents:
diff changeset
    46
import static com.sun.tools.javac.code.Flags.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
    47
import static com.sun.tools.javac.code.Flags.BLOCK;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    48
import static com.sun.tools.javac.code.Kinds.*;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
    49
import static com.sun.tools.javac.code.TypeTag.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    50
import static com.sun.tools.javac.jvm.ByteCodes.*;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
    51
import static com.sun.tools.javac.tree.JCTree.Tag.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    52
06bc494ca11e Initial load
duke
parents:
diff changeset
    53
/** This pass translates away some syntactic sugar: inner classes,
06bc494ca11e Initial load
duke
parents:
diff changeset
    54
 *  class literals, assertions, foreach loops, etc.
06bc494ca11e Initial load
duke
parents:
diff changeset
    55
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    56
 *  <p><b>This is NOT part of any supported API.
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    57
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    58
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    59
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    60
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    61
public class Lower extends TreeTranslator {
06bc494ca11e Initial load
duke
parents:
diff changeset
    62
    protected static final Context.Key<Lower> lowerKey =
06bc494ca11e Initial load
duke
parents:
diff changeset
    63
        new Context.Key<Lower>();
06bc494ca11e Initial load
duke
parents:
diff changeset
    64
06bc494ca11e Initial load
duke
parents:
diff changeset
    65
    public static Lower instance(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
    66
        Lower instance = context.get(lowerKey);
06bc494ca11e Initial load
duke
parents:
diff changeset
    67
        if (instance == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
    68
            instance = new Lower(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
    69
        return instance;
06bc494ca11e Initial load
duke
parents:
diff changeset
    70
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
    71
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1037
diff changeset
    72
    private Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    73
    private Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
    74
    private Symtab syms;
06bc494ca11e Initial load
duke
parents:
diff changeset
    75
    private Resolve rs;
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
    private Check chk;
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
    private Attr attr;
06bc494ca11e Initial load
duke
parents:
diff changeset
    78
    private TreeMaker make;
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
    private DiagnosticPosition make_pos;
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
    private ClassWriter writer;
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
    private ClassReader reader;
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
    private ConstFold cfolder;
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
    private Target target;
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
    private Source source;
06bc494ca11e Initial load
duke
parents:
diff changeset
    85
    private boolean allowEnums;
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
    private final Name dollarAssertionsDisabled;
06bc494ca11e Initial load
duke
parents:
diff changeset
    87
    private final Name classDollar;
06bc494ca11e Initial load
duke
parents:
diff changeset
    88
    private Types types;
06bc494ca11e Initial load
duke
parents:
diff changeset
    89
    private boolean debugLower;
6575
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
    90
    private PkgInfo pkginfoOpt;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    91
06bc494ca11e Initial load
duke
parents:
diff changeset
    92
    protected Lower(Context context) {
06bc494ca11e Initial load
duke
parents:
diff changeset
    93
        context.put(lowerKey, this);
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1037
diff changeset
    94
        names = Names.instance(context);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    95
        log = Log.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
    96
        syms = Symtab.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
    97
        rs = Resolve.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
    98
        chk = Check.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
    99
        attr = Attr.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   100
        make = TreeMaker.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   101
        writer = ClassWriter.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   102
        reader = ClassReader.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   103
        cfolder = ConstFold.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   104
        target = Target.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   105
        source = Source.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   106
        allowEnums = source.allowEnums();
06bc494ca11e Initial load
duke
parents:
diff changeset
   107
        dollarAssertionsDisabled = names.
06bc494ca11e Initial load
duke
parents:
diff changeset
   108
            fromString(target.syntheticNameChar() + "assertionsDisabled");
06bc494ca11e Initial load
duke
parents:
diff changeset
   109
        classDollar = names.
06bc494ca11e Initial load
duke
parents:
diff changeset
   110
            fromString("class" + target.syntheticNameChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
   111
06bc494ca11e Initial load
duke
parents:
diff changeset
   112
        types = Types.instance(context);
06bc494ca11e Initial load
duke
parents:
diff changeset
   113
        Options options = Options.instance(context);
6721
d92073844278 6988436: Cleanup javac option handling
jjg
parents: 6712
diff changeset
   114
        debugLower = options.isSet("debuglower");
6575
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
   115
        pkginfoOpt = PkgInfo.get(options);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   116
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   117
06bc494ca11e Initial load
duke
parents:
diff changeset
   118
    /** The currently enclosing class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   119
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   120
    ClassSymbol currentClass;
06bc494ca11e Initial load
duke
parents:
diff changeset
   121
06bc494ca11e Initial load
duke
parents:
diff changeset
   122
    /** A queue of all translated classes.
06bc494ca11e Initial load
duke
parents:
diff changeset
   123
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   124
    ListBuffer<JCTree> translated;
06bc494ca11e Initial load
duke
parents:
diff changeset
   125
06bc494ca11e Initial load
duke
parents:
diff changeset
   126
    /** Environment for symbol lookup, set by translateTopLevelClass.
06bc494ca11e Initial load
duke
parents:
diff changeset
   127
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   128
    Env<AttrContext> attrEnv;
06bc494ca11e Initial load
duke
parents:
diff changeset
   129
06bc494ca11e Initial load
duke
parents:
diff changeset
   130
    /** A hash table mapping syntax trees to their ending source positions.
06bc494ca11e Initial load
duke
parents:
diff changeset
   131
     */
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   132
    EndPosTable endPosTable;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   133
06bc494ca11e Initial load
duke
parents:
diff changeset
   134
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   135
 * Global mappings
06bc494ca11e Initial load
duke
parents:
diff changeset
   136
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   137
06bc494ca11e Initial load
duke
parents:
diff changeset
   138
    /** A hash table mapping local classes to their definitions.
06bc494ca11e Initial load
duke
parents:
diff changeset
   139
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   140
    Map<ClassSymbol, JCClassDecl> classdefs;
06bc494ca11e Initial load
duke
parents:
diff changeset
   141
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
   142
    /** A hash table mapping local classes to a list of pruned trees.
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
   143
     */
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
   144
    public Map<ClassSymbol, List<JCTree>> prunedTree = new WeakHashMap<ClassSymbol, List<JCTree>>();
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
   145
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   146
    /** A hash table mapping virtual accessed symbols in outer subclasses
06bc494ca11e Initial load
duke
parents:
diff changeset
   147
     *  to the actually referred symbol in superclasses.
06bc494ca11e Initial load
duke
parents:
diff changeset
   148
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   149
    Map<Symbol,Symbol> actualSymbols;
06bc494ca11e Initial load
duke
parents:
diff changeset
   150
06bc494ca11e Initial load
duke
parents:
diff changeset
   151
    /** The current method definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   152
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   153
    JCMethodDecl currentMethodDef;
06bc494ca11e Initial load
duke
parents:
diff changeset
   154
06bc494ca11e Initial load
duke
parents:
diff changeset
   155
    /** The current method symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   156
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   157
    MethodSymbol currentMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   158
06bc494ca11e Initial load
duke
parents:
diff changeset
   159
    /** The currently enclosing outermost class definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   160
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   161
    JCClassDecl outermostClassDef;
06bc494ca11e Initial load
duke
parents:
diff changeset
   162
06bc494ca11e Initial load
duke
parents:
diff changeset
   163
    /** The currently enclosing outermost member definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   164
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   165
    JCTree outermostMemberDef;
06bc494ca11e Initial load
duke
parents:
diff changeset
   166
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   167
    /** A map from local variable symbols to their translation (as per LambdaToMethod).
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   168
     * This is required when a capturing local class is created from a lambda (in which
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   169
     * case the captured symbols should be replaced with the translated lambda symbols).
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   170
     */
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   171
    Map<Symbol, Symbol> lambdaTranslationMap = null;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   172
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   173
    /** A navigator class for assembling a mapping from local class symbols
06bc494ca11e Initial load
duke
parents:
diff changeset
   174
     *  to class definition trees.
06bc494ca11e Initial load
duke
parents:
diff changeset
   175
     *  There is only one case; all other cases simply traverse down the tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
   176
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   177
    class ClassMap extends TreeScanner {
06bc494ca11e Initial load
duke
parents:
diff changeset
   178
06bc494ca11e Initial load
duke
parents:
diff changeset
   179
        /** All encountered class defs are entered into classdefs table.
06bc494ca11e Initial load
duke
parents:
diff changeset
   180
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   181
        public void visitClassDef(JCClassDecl tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   182
            classdefs.put(tree.sym, tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   183
            super.visitClassDef(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   184
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   185
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   186
    ClassMap classMap = new ClassMap();
06bc494ca11e Initial load
duke
parents:
diff changeset
   187
06bc494ca11e Initial load
duke
parents:
diff changeset
   188
    /** Map a class symbol to its definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   189
     *  @param c    The class symbol of which we want to determine the definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
   190
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   191
    JCClassDecl classDef(ClassSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   192
        // First lookup the class in the classdefs table.
06bc494ca11e Initial load
duke
parents:
diff changeset
   193
        JCClassDecl def = classdefs.get(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
   194
        if (def == null && outermostMemberDef != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   195
            // If this fails, traverse outermost member definition, entering all
06bc494ca11e Initial load
duke
parents:
diff changeset
   196
            // local classes into classdefs, and try again.
06bc494ca11e Initial load
duke
parents:
diff changeset
   197
            classMap.scan(outermostMemberDef);
06bc494ca11e Initial load
duke
parents:
diff changeset
   198
            def = classdefs.get(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
   199
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   200
        if (def == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   201
            // If this fails, traverse outermost class definition, entering all
06bc494ca11e Initial load
duke
parents:
diff changeset
   202
            // local classes into classdefs, and try again.
06bc494ca11e Initial load
duke
parents:
diff changeset
   203
            classMap.scan(outermostClassDef);
06bc494ca11e Initial load
duke
parents:
diff changeset
   204
            def = classdefs.get(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
   205
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   206
        return def;
06bc494ca11e Initial load
duke
parents:
diff changeset
   207
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   208
06bc494ca11e Initial load
duke
parents:
diff changeset
   209
    /** A hash table mapping class symbols to lists of free variables.
06bc494ca11e Initial load
duke
parents:
diff changeset
   210
     *  accessed by them. Only free variables of the method immediately containing
06bc494ca11e Initial load
duke
parents:
diff changeset
   211
     *  a class are associated with that class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   212
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   213
    Map<ClassSymbol,List<VarSymbol>> freevarCache;
06bc494ca11e Initial load
duke
parents:
diff changeset
   214
06bc494ca11e Initial load
duke
parents:
diff changeset
   215
    /** A navigator class for collecting the free variables accessed
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   216
     *  from a local class. There is only one case; all other cases simply
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   217
     *  traverse down the tree. This class doesn't deal with the specific
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   218
     *  of Lower - it's an abstract visitor that is meant to be reused in
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   219
     *  order to share the local variable capture logic.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   220
     */
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   221
    abstract class BasicFreeVarCollector extends TreeScanner {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   222
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   223
        /** Add all free variables of class c to fvs list
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   224
         *  unless they are already there.
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   225
         */
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   226
        abstract void addFreeVars(ClassSymbol c);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   227
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   228
        /** If tree refers to a variable in owner of local class, add it to
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   229
         *  free variables list.
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   230
         */
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   231
        public void visitIdent(JCIdent tree) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   232
            visitSymbol(tree.sym);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   233
        }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   234
        // where
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   235
        abstract void visitSymbol(Symbol _sym);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   236
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   237
        /** If tree refers to a class instance creation expression
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   238
         *  add all free variables of the freshly created class.
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   239
         */
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   240
        public void visitNewClass(JCNewClass tree) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   241
            ClassSymbol c = (ClassSymbol)tree.constructor.owner;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   242
            addFreeVars(c);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   243
            super.visitNewClass(tree);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   244
        }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   245
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   246
        /** If tree refers to a superclass constructor call,
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   247
         *  add all free variables of the superclass.
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   248
         */
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   249
        public void visitApply(JCMethodInvocation tree) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   250
            if (TreeInfo.name(tree.meth) == names._super) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   251
                addFreeVars((ClassSymbol) TreeInfo.symbol(tree.meth).owner);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   252
            }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   253
            super.visitApply(tree);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   254
        }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   255
    }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   256
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   257
    /**
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   258
     * Lower-specific subclass of {@code BasicFreeVarCollector}.
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   259
     */
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   260
    class FreeVarCollector extends BasicFreeVarCollector {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
06bc494ca11e Initial load
duke
parents:
diff changeset
   262
        /** The owner of the local class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   264
        Symbol owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   265
06bc494ca11e Initial load
duke
parents:
diff changeset
   266
        /** The local class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   267
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   268
        ClassSymbol clazz;
06bc494ca11e Initial load
duke
parents:
diff changeset
   269
06bc494ca11e Initial load
duke
parents:
diff changeset
   270
        /** The list of owner's variables accessed from within the local class,
06bc494ca11e Initial load
duke
parents:
diff changeset
   271
         *  without any duplicates.
06bc494ca11e Initial load
duke
parents:
diff changeset
   272
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   273
        List<VarSymbol> fvs;
06bc494ca11e Initial load
duke
parents:
diff changeset
   274
06bc494ca11e Initial load
duke
parents:
diff changeset
   275
        FreeVarCollector(ClassSymbol clazz) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   276
            this.clazz = clazz;
06bc494ca11e Initial load
duke
parents:
diff changeset
   277
            this.owner = clazz.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   278
            this.fvs = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
   279
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   280
06bc494ca11e Initial load
duke
parents:
diff changeset
   281
        /** Add free variable to fvs list unless it is already there.
06bc494ca11e Initial load
duke
parents:
diff changeset
   282
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   283
        private void addFreeVar(VarSymbol v) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   284
            for (List<VarSymbol> l = fvs; l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
   285
                if (l.head == v) return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   286
            fvs = fvs.prepend(v);
06bc494ca11e Initial load
duke
parents:
diff changeset
   287
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   288
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   289
        @Override
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   290
        void addFreeVars(ClassSymbol c) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   291
            List<VarSymbol> fvs = freevarCache.get(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
   292
            if (fvs != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   293
                for (List<VarSymbol> l = fvs; l.nonEmpty(); l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   294
                    addFreeVar(l.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
   295
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   296
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   297
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   298
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   299
        @Override
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
   300
        void visitSymbol(Symbol _sym) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   301
            Symbol sym = _sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   302
            if (sym.kind == VAR || sym.kind == MTH) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   303
                while (sym != null && sym.owner != owner)
06bc494ca11e Initial load
duke
parents:
diff changeset
   304
                    sym = proxies.lookup(proxyName(sym.name)).sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   305
                if (sym != null && sym.owner == owner) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   306
                    VarSymbol v = (VarSymbol)sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   307
                    if (v.getConstValue() == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   308
                        addFreeVar(v);
06bc494ca11e Initial load
duke
parents:
diff changeset
   309
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   310
                } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   311
                    if (outerThisStack.head != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   312
                        outerThisStack.head != _sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
   313
                        visitSymbol(outerThisStack.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
   314
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   315
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   316
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   317
06bc494ca11e Initial load
duke
parents:
diff changeset
   318
        /** If tree refers to a class instance creation expression
06bc494ca11e Initial load
duke
parents:
diff changeset
   319
         *  add all free variables of the freshly created class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   320
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   321
        public void visitNewClass(JCNewClass tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   322
            ClassSymbol c = (ClassSymbol)tree.constructor.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   323
            if (tree.encl == null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   324
                c.hasOuterInstance() &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   325
                outerThisStack.head != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   326
                visitSymbol(outerThisStack.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
   327
            super.visitNewClass(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   328
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   329
06bc494ca11e Initial load
duke
parents:
diff changeset
   330
        /** If tree refers to a qualified this or super expression
06bc494ca11e Initial load
duke
parents:
diff changeset
   331
         *  for anything but the current class, add the outer this
06bc494ca11e Initial load
duke
parents:
diff changeset
   332
         *  stack as a free variable.
06bc494ca11e Initial load
duke
parents:
diff changeset
   333
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   334
        public void visitSelect(JCFieldAccess tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
            if ((tree.name == names._this || tree.name == names._super) &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
                tree.selected.type.tsym != clazz &&
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
                outerThisStack.head != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   338
                visitSymbol(outerThisStack.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
   339
            super.visitSelect(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   340
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   341
06bc494ca11e Initial load
duke
parents:
diff changeset
   342
        /** If tree refers to a superclass constructor call,
06bc494ca11e Initial load
duke
parents:
diff changeset
   343
         *  add all free variables of the superclass.
06bc494ca11e Initial load
duke
parents:
diff changeset
   344
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   345
        public void visitApply(JCMethodInvocation tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   346
            if (TreeInfo.name(tree.meth) == names._super) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   347
                Symbol constructor = TreeInfo.symbol(tree.meth);
06bc494ca11e Initial load
duke
parents:
diff changeset
   348
                ClassSymbol c = (ClassSymbol)constructor.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
   349
                if (c.hasOuterInstance() &&
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   350
                    !tree.meth.hasTag(SELECT) &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   351
                    outerThisStack.head != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   352
                    visitSymbol(outerThisStack.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
   353
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   354
            super.visitApply(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   355
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   358
    ClassSymbol ownerToCopyFreeVarsFrom(ClassSymbol c) {
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   359
        if (!c.isLocal()) {
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   360
            return null;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   361
        }
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   362
        Symbol currentOwner = c.owner;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   363
        while ((currentOwner.owner.kind & TYP) != 0 && currentOwner.isLocal()) {
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   364
            currentOwner = currentOwner.owner;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   365
        }
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   366
        if ((currentOwner.owner.kind & (VAR | MTH)) != 0 && c.isSubClass(currentOwner, types)) {
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   367
            return (ClassSymbol)currentOwner;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   368
        }
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   369
        return null;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   370
    }
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   371
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
    /** Return the variables accessed from within a local class, which
06bc494ca11e Initial load
duke
parents:
diff changeset
   373
     *  are declared in the local class' owner.
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
     *  (in reverse order of first access).
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   376
    List<VarSymbol> freevars(ClassSymbol c)  {
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   377
        List<VarSymbol> fvs = freevarCache.get(c);
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   378
        if (fvs != null) {
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   379
            return fvs;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   380
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
        if ((c.owner.kind & (VAR | MTH)) != 0) {
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   382
            FreeVarCollector collector = new FreeVarCollector(c);
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   383
            collector.scan(classDef(c));
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   384
            fvs = collector.fvs;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   385
            freevarCache.put(c, fvs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
            return fvs;
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
        } else {
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   388
            ClassSymbol owner = ownerToCopyFreeVarsFrom(c);
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   389
            if (owner != null) {
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   390
                fvs = freevarCache.get(owner);
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   391
                freevarCache.put(c, fvs);
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   392
                return fvs;
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   393
            } else {
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   394
                return List.nil();
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
   395
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   397
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   398
06bc494ca11e Initial load
duke
parents:
diff changeset
   399
    Map<TypeSymbol,EnumMapping> enumSwitchMap = new LinkedHashMap<TypeSymbol,EnumMapping>();
06bc494ca11e Initial load
duke
parents:
diff changeset
   400
06bc494ca11e Initial load
duke
parents:
diff changeset
   401
    EnumMapping mapForEnum(DiagnosticPosition pos, TypeSymbol enumClass) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   402
        EnumMapping map = enumSwitchMap.get(enumClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
   403
        if (map == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   404
            enumSwitchMap.put(enumClass, map = new EnumMapping(pos, enumClass));
06bc494ca11e Initial load
duke
parents:
diff changeset
   405
        return map;
06bc494ca11e Initial load
duke
parents:
diff changeset
   406
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   407
06bc494ca11e Initial load
duke
parents:
diff changeset
   408
    /** This map gives a translation table to be used for enum
06bc494ca11e Initial load
duke
parents:
diff changeset
   409
     *  switches.
06bc494ca11e Initial load
duke
parents:
diff changeset
   410
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   411
     *  <p>For each enum that appears as the type of a switch
06bc494ca11e Initial load
duke
parents:
diff changeset
   412
     *  expression, we maintain an EnumMapping to assist in the
06bc494ca11e Initial load
duke
parents:
diff changeset
   413
     *  translation, as exemplified by the following example:
06bc494ca11e Initial load
duke
parents:
diff changeset
   414
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   415
     *  <p>we translate
06bc494ca11e Initial load
duke
parents:
diff changeset
   416
     *  <pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
   417
     *          switch(colorExpression) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   418
     *          case red: stmt1;
06bc494ca11e Initial load
duke
parents:
diff changeset
   419
     *          case green: stmt2;
06bc494ca11e Initial load
duke
parents:
diff changeset
   420
     *          }
06bc494ca11e Initial load
duke
parents:
diff changeset
   421
     *  </pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
   422
     *  into
06bc494ca11e Initial load
duke
parents:
diff changeset
   423
     *  <pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
   424
     *          switch(Outer$0.$EnumMap$Color[colorExpression.ordinal()]) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   425
     *          case 1: stmt1;
06bc494ca11e Initial load
duke
parents:
diff changeset
   426
     *          case 2: stmt2
06bc494ca11e Initial load
duke
parents:
diff changeset
   427
     *          }
06bc494ca11e Initial load
duke
parents:
diff changeset
   428
     *  </pre>
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
   429
     *  with the auxiliary table initialized as follows:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   430
     *  <pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
   431
     *          class Outer$0 {
06bc494ca11e Initial load
duke
parents:
diff changeset
   432
     *              synthetic final int[] $EnumMap$Color = new int[Color.values().length];
06bc494ca11e Initial load
duke
parents:
diff changeset
   433
     *              static {
06bc494ca11e Initial load
duke
parents:
diff changeset
   434
     *                  try { $EnumMap$Color[red.ordinal()] = 1; } catch (NoSuchFieldError ex) {}
06bc494ca11e Initial load
duke
parents:
diff changeset
   435
     *                  try { $EnumMap$Color[green.ordinal()] = 2; } catch (NoSuchFieldError ex) {}
06bc494ca11e Initial load
duke
parents:
diff changeset
   436
     *              }
06bc494ca11e Initial load
duke
parents:
diff changeset
   437
     *          }
06bc494ca11e Initial load
duke
parents:
diff changeset
   438
     *  </pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
   439
     *  class EnumMapping provides mapping data and support methods for this translation.
06bc494ca11e Initial load
duke
parents:
diff changeset
   440
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   441
    class EnumMapping {
06bc494ca11e Initial load
duke
parents:
diff changeset
   442
        EnumMapping(DiagnosticPosition pos, TypeSymbol forEnum) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   443
            this.forEnum = forEnum;
06bc494ca11e Initial load
duke
parents:
diff changeset
   444
            this.values = new LinkedHashMap<VarSymbol,Integer>();
06bc494ca11e Initial load
duke
parents:
diff changeset
   445
            this.pos = pos;
06bc494ca11e Initial load
duke
parents:
diff changeset
   446
            Name varName = names
06bc494ca11e Initial load
duke
parents:
diff changeset
   447
                .fromString(target.syntheticNameChar() +
06bc494ca11e Initial load
duke
parents:
diff changeset
   448
                            "SwitchMap" +
06bc494ca11e Initial load
duke
parents:
diff changeset
   449
                            target.syntheticNameChar() +
06bc494ca11e Initial load
duke
parents:
diff changeset
   450
                            writer.xClassName(forEnum.type).toString()
06bc494ca11e Initial load
duke
parents:
diff changeset
   451
                            .replace('/', '.')
06bc494ca11e Initial load
duke
parents:
diff changeset
   452
                            .replace('.', target.syntheticNameChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
   453
            ClassSymbol outerCacheClass = outerCacheClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
   454
            this.mapVar = new VarSymbol(STATIC | SYNTHETIC | FINAL,
06bc494ca11e Initial load
duke
parents:
diff changeset
   455
                                        varName,
06bc494ca11e Initial load
duke
parents:
diff changeset
   456
                                        new ArrayType(syms.intType, syms.arrayClass),
06bc494ca11e Initial load
duke
parents:
diff changeset
   457
                                        outerCacheClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
   458
            enterSynthetic(pos, mapVar, outerCacheClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
   459
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   460
06bc494ca11e Initial load
duke
parents:
diff changeset
   461
        DiagnosticPosition pos = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   462
06bc494ca11e Initial load
duke
parents:
diff changeset
   463
        // the next value to use
06bc494ca11e Initial load
duke
parents:
diff changeset
   464
        int next = 1; // 0 (unused map elements) go to the default label
06bc494ca11e Initial load
duke
parents:
diff changeset
   465
06bc494ca11e Initial load
duke
parents:
diff changeset
   466
        // the enum for which this is a map
06bc494ca11e Initial load
duke
parents:
diff changeset
   467
        final TypeSymbol forEnum;
06bc494ca11e Initial load
duke
parents:
diff changeset
   468
06bc494ca11e Initial load
duke
parents:
diff changeset
   469
        // the field containing the map
06bc494ca11e Initial load
duke
parents:
diff changeset
   470
        final VarSymbol mapVar;
06bc494ca11e Initial load
duke
parents:
diff changeset
   471
06bc494ca11e Initial load
duke
parents:
diff changeset
   472
        // the mapped values
06bc494ca11e Initial load
duke
parents:
diff changeset
   473
        final Map<VarSymbol,Integer> values;
06bc494ca11e Initial load
duke
parents:
diff changeset
   474
06bc494ca11e Initial load
duke
parents:
diff changeset
   475
        JCLiteral forConstant(VarSymbol v) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   476
            Integer result = values.get(v);
06bc494ca11e Initial load
duke
parents:
diff changeset
   477
            if (result == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   478
                values.put(v, result = next++);
06bc494ca11e Initial load
duke
parents:
diff changeset
   479
            return make.Literal(result);
06bc494ca11e Initial load
duke
parents:
diff changeset
   480
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   481
06bc494ca11e Initial load
duke
parents:
diff changeset
   482
        // generate the field initializer for the map
06bc494ca11e Initial load
duke
parents:
diff changeset
   483
        void translate() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   484
            make.at(pos.getStartPosition());
06bc494ca11e Initial load
duke
parents:
diff changeset
   485
            JCClassDecl owner = classDef((ClassSymbol)mapVar.owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
   486
06bc494ca11e Initial load
duke
parents:
diff changeset
   487
            // synthetic static final int[] $SwitchMap$Color = new int[Color.values().length];
06bc494ca11e Initial load
duke
parents:
diff changeset
   488
            MethodSymbol valuesMethod = lookupMethod(pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
   489
                                                     names.values,
06bc494ca11e Initial load
duke
parents:
diff changeset
   490
                                                     forEnum.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
   491
                                                     List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
   492
            JCExpression size = make // Color.values().length
06bc494ca11e Initial load
duke
parents:
diff changeset
   493
                .Select(make.App(make.QualIdent(valuesMethod)),
06bc494ca11e Initial load
duke
parents:
diff changeset
   494
                        syms.lengthVar);
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
            JCExpression mapVarInit = make
06bc494ca11e Initial load
duke
parents:
diff changeset
   496
                .NewArray(make.Type(syms.intType), List.of(size), null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   497
                .setType(new ArrayType(syms.intType, syms.arrayClass));
06bc494ca11e Initial load
duke
parents:
diff changeset
   498
06bc494ca11e Initial load
duke
parents:
diff changeset
   499
            // try { $SwitchMap$Color[red.ordinal()] = 1; } catch (java.lang.NoSuchFieldError ex) {}
06bc494ca11e Initial load
duke
parents:
diff changeset
   500
            ListBuffer<JCStatement> stmts = new ListBuffer<JCStatement>();
06bc494ca11e Initial load
duke
parents:
diff changeset
   501
            Symbol ordinalMethod = lookupMethod(pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
   502
                                                names.ordinal,
06bc494ca11e Initial load
duke
parents:
diff changeset
   503
                                                forEnum.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
   504
                                                List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
   505
            List<JCCatch> catcher = List.<JCCatch>nil()
06bc494ca11e Initial load
duke
parents:
diff changeset
   506
                .prepend(make.Catch(make.VarDef(new VarSymbol(PARAMETER, names.ex,
06bc494ca11e Initial load
duke
parents:
diff changeset
   507
                                                              syms.noSuchFieldErrorType,
06bc494ca11e Initial load
duke
parents:
diff changeset
   508
                                                              syms.noSymbol),
06bc494ca11e Initial load
duke
parents:
diff changeset
   509
                                                null),
06bc494ca11e Initial load
duke
parents:
diff changeset
   510
                                    make.Block(0, List.<JCStatement>nil())));
06bc494ca11e Initial load
duke
parents:
diff changeset
   511
            for (Map.Entry<VarSymbol,Integer> e : values.entrySet()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   512
                VarSymbol enumerator = e.getKey();
06bc494ca11e Initial load
duke
parents:
diff changeset
   513
                Integer mappedValue = e.getValue();
06bc494ca11e Initial load
duke
parents:
diff changeset
   514
                JCExpression assign = make
06bc494ca11e Initial load
duke
parents:
diff changeset
   515
                    .Assign(make.Indexed(mapVar,
06bc494ca11e Initial load
duke
parents:
diff changeset
   516
                                         make.App(make.Select(make.QualIdent(enumerator),
06bc494ca11e Initial load
duke
parents:
diff changeset
   517
                                                              ordinalMethod))),
06bc494ca11e Initial load
duke
parents:
diff changeset
   518
                            make.Literal(mappedValue))
06bc494ca11e Initial load
duke
parents:
diff changeset
   519
                    .setType(syms.intType);
06bc494ca11e Initial load
duke
parents:
diff changeset
   520
                JCStatement exec = make.Exec(assign);
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
                JCStatement _try = make.Try(make.Block(0, List.of(exec)), catcher, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   522
                stmts.append(_try);
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   524
06bc494ca11e Initial load
duke
parents:
diff changeset
   525
            owner.defs = owner.defs
06bc494ca11e Initial load
duke
parents:
diff changeset
   526
                .prepend(make.Block(STATIC, stmts.toList()))
06bc494ca11e Initial load
duke
parents:
diff changeset
   527
                .prepend(make.VarDef(mapVar, mapVarInit));
06bc494ca11e Initial load
duke
parents:
diff changeset
   528
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   529
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   530
06bc494ca11e Initial load
duke
parents:
diff changeset
   531
06bc494ca11e Initial load
duke
parents:
diff changeset
   532
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   533
 * Tree building blocks
06bc494ca11e Initial load
duke
parents:
diff changeset
   534
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   535
06bc494ca11e Initial load
duke
parents:
diff changeset
   536
    /** Equivalent to make.at(pos.getStartPosition()) with side effect of caching
06bc494ca11e Initial load
duke
parents:
diff changeset
   537
     *  pos as make_pos, for use in diagnostics.
06bc494ca11e Initial load
duke
parents:
diff changeset
   538
     **/
06bc494ca11e Initial load
duke
parents:
diff changeset
   539
    TreeMaker make_at(DiagnosticPosition pos) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   540
        make_pos = pos;
06bc494ca11e Initial load
duke
parents:
diff changeset
   541
        return make.at(pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
   542
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   543
06bc494ca11e Initial load
duke
parents:
diff changeset
   544
    /** Make an attributed tree representing a literal. This will be an
06bc494ca11e Initial load
duke
parents:
diff changeset
   545
     *  Ident node in the case of boolean literals, a Literal node in all
06bc494ca11e Initial load
duke
parents:
diff changeset
   546
     *  other cases.
06bc494ca11e Initial load
duke
parents:
diff changeset
   547
     *  @param type       The literal's type.
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
     *  @param value      The literal's value.
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
    JCExpression makeLit(Type type, Object value) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
   551
        return make.Literal(type.getTag(), value).setType(type.constType(value));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   552
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   553
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
    /** Make an attributed tree representing null.
06bc494ca11e Initial load
duke
parents:
diff changeset
   555
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   556
    JCExpression makeNull() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
        return makeLit(syms.botType, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   558
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   559
06bc494ca11e Initial load
duke
parents:
diff changeset
   560
    /** Make an attributed class instance creation expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
   561
     *  @param ctype    The class type.
06bc494ca11e Initial load
duke
parents:
diff changeset
   562
     *  @param args     The constructor arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
   563
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   564
    JCNewClass makeNewClass(Type ctype, List<JCExpression> args) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   565
        JCNewClass tree = make.NewClass(null,
06bc494ca11e Initial load
duke
parents:
diff changeset
   566
            null, make.QualIdent(ctype.tsym), args, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   567
        tree.constructor = rs.resolveConstructor(
14444
2069262b27c5 8000931: Cleanup Resolve.java
mcimadamore
parents: 14443
diff changeset
   568
            make_pos, attrEnv, ctype, TreeInfo.types(args), List.<Type>nil());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   569
        tree.type = ctype;
06bc494ca11e Initial load
duke
parents:
diff changeset
   570
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
   571
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   572
06bc494ca11e Initial load
duke
parents:
diff changeset
   573
    /** Make an attributed unary expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
   574
     *  @param optag    The operators tree tag.
06bc494ca11e Initial load
duke
parents:
diff changeset
   575
     *  @param arg      The operator's argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
   576
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   577
    JCUnary makeUnary(JCTree.Tag optag, JCExpression arg) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   578
        JCUnary tree = make.Unary(optag, arg);
06bc494ca11e Initial load
duke
parents:
diff changeset
   579
        tree.operator = rs.resolveUnaryOperator(
06bc494ca11e Initial load
duke
parents:
diff changeset
   580
            make_pos, optag, attrEnv, arg.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
   581
        tree.type = tree.operator.type.getReturnType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   582
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
   583
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   584
06bc494ca11e Initial load
duke
parents:
diff changeset
   585
    /** Make an attributed binary expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
   586
     *  @param optag    The operators tree tag.
06bc494ca11e Initial load
duke
parents:
diff changeset
   587
     *  @param lhs      The operator's left argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
   588
     *  @param rhs      The operator's right argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
   589
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   590
    JCBinary makeBinary(JCTree.Tag optag, JCExpression lhs, JCExpression rhs) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   591
        JCBinary tree = make.Binary(optag, lhs, rhs);
06bc494ca11e Initial load
duke
parents:
diff changeset
   592
        tree.operator = rs.resolveBinaryOperator(
06bc494ca11e Initial load
duke
parents:
diff changeset
   593
            make_pos, optag, attrEnv, lhs.type, rhs.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
   594
        tree.type = tree.operator.type.getReturnType();
06bc494ca11e Initial load
duke
parents:
diff changeset
   595
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
   596
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   597
06bc494ca11e Initial load
duke
parents:
diff changeset
   598
    /** Make an attributed assignop expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
   599
     *  @param optag    The operators tree tag.
06bc494ca11e Initial load
duke
parents:
diff changeset
   600
     *  @param lhs      The operator's left argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
   601
     *  @param rhs      The operator's right argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
   602
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   603
    JCAssignOp makeAssignop(JCTree.Tag optag, JCTree lhs, JCTree rhs) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   604
        JCAssignOp tree = make.Assignop(optag, lhs, rhs);
06bc494ca11e Initial load
duke
parents:
diff changeset
   605
        tree.operator = rs.resolveBinaryOperator(
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   606
            make_pos, tree.getTag().noAssignOp(), attrEnv, lhs.type, rhs.type);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   607
        tree.type = lhs.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
   608
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
   609
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   610
06bc494ca11e Initial load
duke
parents:
diff changeset
   611
    /** Convert tree into string object, unless it has already a
06bc494ca11e Initial load
duke
parents:
diff changeset
   612
     *  reference type..
06bc494ca11e Initial load
duke
parents:
diff changeset
   613
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   614
    JCExpression makeString(JCExpression tree) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
   615
        if (!tree.type.isPrimitiveOrVoid()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   616
            return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
   617
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   618
            Symbol valueOfSym = lookupMethod(tree.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   619
                                             names.valueOf,
06bc494ca11e Initial load
duke
parents:
diff changeset
   620
                                             syms.stringType,
06bc494ca11e Initial load
duke
parents:
diff changeset
   621
                                             List.of(tree.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
   622
            return make.App(make.QualIdent(valueOfSym), List.of(tree));
06bc494ca11e Initial load
duke
parents:
diff changeset
   623
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   624
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   625
06bc494ca11e Initial load
duke
parents:
diff changeset
   626
    /** Create an empty anonymous class definition and enter and complete
06bc494ca11e Initial load
duke
parents:
diff changeset
   627
     *  its symbol. Return the class definition's symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   628
     *  and create
06bc494ca11e Initial load
duke
parents:
diff changeset
   629
     *  @param flags    The class symbol's flags
06bc494ca11e Initial load
duke
parents:
diff changeset
   630
     *  @param owner    The class symbol's owner
06bc494ca11e Initial load
duke
parents:
diff changeset
   631
     */
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   632
    JCClassDecl makeEmptyClass(long flags, ClassSymbol owner) {
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   633
        return makeEmptyClass(flags, owner, null, true);
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   634
    }
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   635
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   636
    JCClassDecl makeEmptyClass(long flags, ClassSymbol owner, Name flatname,
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   637
            boolean addToDefs) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   638
        // Create class symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   639
        ClassSymbol c = reader.defineClass(names.empty, owner);
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   640
        if (flatname != null) {
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   641
            c.flatname = flatname;
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   642
        } else {
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   643
            c.flatname = chk.localClassName(c);
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   644
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   645
        c.sourcefile = owner.sourcefile;
06bc494ca11e Initial load
duke
parents:
diff changeset
   646
        c.completer = null;
8242
3873b4aaf4a8 7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
mcimadamore
parents: 8032
diff changeset
   647
        c.members_field = new Scope(c);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   648
        c.flags_field = flags;
06bc494ca11e Initial load
duke
parents:
diff changeset
   649
        ClassType ctype = (ClassType) c.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
   650
        ctype.supertype_field = syms.objectType;
06bc494ca11e Initial load
duke
parents:
diff changeset
   651
        ctype.interfaces_field = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
   652
06bc494ca11e Initial load
duke
parents:
diff changeset
   653
        JCClassDecl odef = classDef(owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
   654
06bc494ca11e Initial load
duke
parents:
diff changeset
   655
        // Enter class symbol in owner scope and compiled table.
06bc494ca11e Initial load
duke
parents:
diff changeset
   656
        enterSynthetic(odef.pos(), c, owner.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
   657
        chk.compiled.put(c.flatname, c);
06bc494ca11e Initial load
duke
parents:
diff changeset
   658
06bc494ca11e Initial load
duke
parents:
diff changeset
   659
        // Create class definition tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
   660
        JCClassDecl cdef = make.ClassDef(
06bc494ca11e Initial load
duke
parents:
diff changeset
   661
            make.Modifiers(flags), names.empty,
06bc494ca11e Initial load
duke
parents:
diff changeset
   662
            List.<JCTypeParameter>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
   663
            null, List.<JCExpression>nil(), List.<JCTree>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
   664
        cdef.sym = c;
06bc494ca11e Initial load
duke
parents:
diff changeset
   665
        cdef.type = c.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
   666
06bc494ca11e Initial load
duke
parents:
diff changeset
   667
        // Append class definition tree to owner's definitions.
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   668
        if (addToDefs) odef.defs = odef.defs.prepend(cdef);
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   669
        return cdef;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   670
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   671
06bc494ca11e Initial load
duke
parents:
diff changeset
   672
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   673
 * Symbol manipulation utilities
06bc494ca11e Initial load
duke
parents:
diff changeset
   674
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   675
06bc494ca11e Initial load
duke
parents:
diff changeset
   676
    /** Enter a synthetic symbol in a given scope, but complain if there was already one there.
06bc494ca11e Initial load
duke
parents:
diff changeset
   677
     *  @param pos           Position for error reporting.
06bc494ca11e Initial load
duke
parents:
diff changeset
   678
     *  @param sym           The symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   679
     *  @param s             The scope.
06bc494ca11e Initial load
duke
parents:
diff changeset
   680
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   681
    private void enterSynthetic(DiagnosticPosition pos, Symbol sym, Scope s) {
3557
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   682
        s.enter(sym);
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   683
    }
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   684
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   685
    /** Create a fresh synthetic name within a given scope - the unique name is
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   686
     *  obtained by appending '$' chars at the end of the name until no match
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   687
     *  is found.
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   688
     *
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   689
     * @param name base name
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   690
     * @param s scope in which the name has to be unique
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   691
     * @return fresh synthetic name
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   692
     */
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   693
    private Name makeSyntheticName(Name name, Scope s) {
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   694
        do {
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   695
            name = name.append(
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   696
                    target.syntheticNameChar(),
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   697
                    names.empty);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   698
        } while (lookupSynthetic(name, s) != null);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   699
        return name;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   700
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
   701
3557
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   702
    /** Check whether synthetic symbols generated during lowering conflict
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   703
     *  with user-defined symbols.
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   704
     *
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   705
     *  @param translatedTrees lowered class trees
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   706
     */
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   707
    void checkConflicts(List<JCTree> translatedTrees) {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   708
        for (JCTree t : translatedTrees) {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   709
            t.accept(conflictsChecker);
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   710
        }
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   711
    }
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   712
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   713
    JCTree.Visitor conflictsChecker = new TreeScanner() {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   714
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   715
        TypeSymbol currentClass;
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   716
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   717
        @Override
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   718
        public void visitMethodDef(JCMethodDecl that) {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   719
            chk.checkConflicts(that.pos(), that.sym, currentClass);
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   720
            super.visitMethodDef(that);
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   721
        }
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   722
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   723
        @Override
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   724
        public void visitVarDef(JCVariableDecl that) {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   725
            if (that.sym.owner.kind == TYP) {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   726
                chk.checkConflicts(that.pos(), that.sym, currentClass);
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   727
            }
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   728
            super.visitVarDef(that);
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   729
        }
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   730
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   731
        @Override
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   732
        public void visitClassDef(JCClassDecl that) {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   733
            TypeSymbol prevCurrentClass = currentClass;
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   734
            currentClass = that.sym;
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   735
            try {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   736
                super.visitClassDef(that);
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   737
            }
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   738
            finally {
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   739
                currentClass = prevCurrentClass;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   740
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   741
        }
3557
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
   742
    };
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   743
06bc494ca11e Initial load
duke
parents:
diff changeset
   744
    /** Look up a synthetic name in a given scope.
14259
fb94a1df0d53 8000208: fix langtools javadoc comment issues
jjg
parents: 14057
diff changeset
   745
     *  @param s            The scope.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   746
     *  @param name         The name.
06bc494ca11e Initial load
duke
parents:
diff changeset
   747
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   748
    private Symbol lookupSynthetic(Name name, Scope s) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   749
        Symbol sym = s.lookup(name).sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   750
        return (sym==null || (sym.flags()&SYNTHETIC)==0) ? null : sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   751
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   752
06bc494ca11e Initial load
duke
parents:
diff changeset
   753
    /** Look up a method in a given scope.
06bc494ca11e Initial load
duke
parents:
diff changeset
   754
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   755
    private MethodSymbol lookupMethod(DiagnosticPosition pos, Name name, Type qual, List<Type> args) {
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14444
diff changeset
   756
        return rs.resolveInternalMethod(pos, attrEnv, qual, name, args, List.<Type>nil());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   757
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   758
06bc494ca11e Initial load
duke
parents:
diff changeset
   759
    /** Look up a constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
   760
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   761
    private MethodSymbol lookupConstructor(DiagnosticPosition pos, Type qual, List<Type> args) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   762
        return rs.resolveInternalConstructor(pos, attrEnv, qual, args, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   763
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   764
06bc494ca11e Initial load
duke
parents:
diff changeset
   765
    /** Look up a field.
06bc494ca11e Initial load
duke
parents:
diff changeset
   766
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   767
    private VarSymbol lookupField(DiagnosticPosition pos, Type qual, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   768
        return rs.resolveInternalField(pos, attrEnv, qual, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
   769
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   770
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   771
    /** Anon inner classes are used as access constructor tags.
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   772
     * accessConstructorTag will use an existing anon class if one is available,
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   773
     * and synthethise a class (with makeEmptyClass) if one is not available.
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   774
     * However, there is a small possibility that an existing class will not
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   775
     * be generated as expected if it is inside a conditional with a constant
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   776
     * expression. If that is found to be the case, create an empty class tree here.
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   777
     */
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   778
    private void checkAccessConstructorTags() {
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   779
        for (List<ClassSymbol> l = accessConstrTags; l.nonEmpty(); l = l.tail) {
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   780
            ClassSymbol c = l.head;
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   781
            if (isTranslatedClassAvailable(c))
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   782
                continue;
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   783
            // Create class definition tree.
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   784
            JCClassDecl cdec = makeEmptyClass(STATIC | SYNTHETIC,
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   785
                    c.outermostClass(), c.flatname, false);
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   786
            swapAccessConstructorTag(c, cdec.sym);
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   787
            translated.append(cdec);
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   788
        }
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   789
    }
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   790
    // where
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   791
    private boolean isTranslatedClassAvailable(ClassSymbol c) {
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   792
        for (JCTree tree: translated) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   793
            if (tree.hasTag(CLASSDEF)
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   794
                    && ((JCClassDecl) tree).sym == c) {
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   795
                return true;
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   796
            }
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   797
        }
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   798
        return false;
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   799
    }
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   800
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   801
    void swapAccessConstructorTag(ClassSymbol oldCTag, ClassSymbol newCTag) {
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   802
        for (MethodSymbol methodSymbol : accessConstrs.values()) {
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   803
            Assert.check(methodSymbol.type.hasTag(METHOD));
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   804
            MethodType oldMethodType =
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   805
                    (MethodType)methodSymbol.type;
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   806
            if (oldMethodType.argtypes.head.tsym == oldCTag)
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   807
                methodSymbol.type =
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   808
                    types.createMethodTypeWithParameters(oldMethodType,
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   809
                        oldMethodType.getParameterTypes().tail
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   810
                            .prepend(newCTag.erasure(types)));
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   811
        }
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   812
    }
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
   813
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   814
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
   815
 * Access methods
06bc494ca11e Initial load
duke
parents:
diff changeset
   816
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
   817
06bc494ca11e Initial load
duke
parents:
diff changeset
   818
    /** Access codes for dereferencing, assignment,
06bc494ca11e Initial load
duke
parents:
diff changeset
   819
     *  and pre/post increment/decrement.
06bc494ca11e Initial load
duke
parents:
diff changeset
   820
     *  Access codes for assignment operations are determined by method accessCode
06bc494ca11e Initial load
duke
parents:
diff changeset
   821
     *  below.
06bc494ca11e Initial load
duke
parents:
diff changeset
   822
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
   823
     *  All access codes for accesses to the current class are even.
06bc494ca11e Initial load
duke
parents:
diff changeset
   824
     *  If a member of the superclass should be accessed instead (because
06bc494ca11e Initial load
duke
parents:
diff changeset
   825
     *  access was via a qualified super), add one to the corresponding code
06bc494ca11e Initial load
duke
parents:
diff changeset
   826
     *  for the current class, making the number odd.
06bc494ca11e Initial load
duke
parents:
diff changeset
   827
     *  This numbering scheme is used by the backend to decide whether
06bc494ca11e Initial load
duke
parents:
diff changeset
   828
     *  to issue an invokevirtual or invokespecial call.
06bc494ca11e Initial load
duke
parents:
diff changeset
   829
     *
14259
fb94a1df0d53 8000208: fix langtools javadoc comment issues
jjg
parents: 14057
diff changeset
   830
     *  @see Gen#visitSelect(JCFieldAccess tree)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   831
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   832
    private static final int
06bc494ca11e Initial load
duke
parents:
diff changeset
   833
        DEREFcode = 0,
06bc494ca11e Initial load
duke
parents:
diff changeset
   834
        ASSIGNcode = 2,
06bc494ca11e Initial load
duke
parents:
diff changeset
   835
        PREINCcode = 4,
06bc494ca11e Initial load
duke
parents:
diff changeset
   836
        PREDECcode = 6,
06bc494ca11e Initial load
duke
parents:
diff changeset
   837
        POSTINCcode = 8,
06bc494ca11e Initial load
duke
parents:
diff changeset
   838
        POSTDECcode = 10,
06bc494ca11e Initial load
duke
parents:
diff changeset
   839
        FIRSTASGOPcode = 12;
06bc494ca11e Initial load
duke
parents:
diff changeset
   840
06bc494ca11e Initial load
duke
parents:
diff changeset
   841
    /** Number of access codes
06bc494ca11e Initial load
duke
parents:
diff changeset
   842
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   843
    private static final int NCODES = accessCode(ByteCodes.lushrl) + 2;
06bc494ca11e Initial load
duke
parents:
diff changeset
   844
06bc494ca11e Initial load
duke
parents:
diff changeset
   845
    /** A mapping from symbols to their access numbers.
06bc494ca11e Initial load
duke
parents:
diff changeset
   846
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   847
    private Map<Symbol,Integer> accessNums;
06bc494ca11e Initial load
duke
parents:
diff changeset
   848
06bc494ca11e Initial load
duke
parents:
diff changeset
   849
    /** A mapping from symbols to an array of access symbols, indexed by
06bc494ca11e Initial load
duke
parents:
diff changeset
   850
     *  access code.
06bc494ca11e Initial load
duke
parents:
diff changeset
   851
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   852
    private Map<Symbol,MethodSymbol[]> accessSyms;
06bc494ca11e Initial load
duke
parents:
diff changeset
   853
06bc494ca11e Initial load
duke
parents:
diff changeset
   854
    /** A mapping from (constructor) symbols to access constructor symbols.
06bc494ca11e Initial load
duke
parents:
diff changeset
   855
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   856
    private Map<Symbol,MethodSymbol> accessConstrs;
06bc494ca11e Initial load
duke
parents:
diff changeset
   857
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   858
    /** A list of all class symbols used for access constructor tags.
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   859
     */
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   860
    private List<ClassSymbol> accessConstrTags;
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
   861
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   862
    /** A queue for all accessed symbols.
06bc494ca11e Initial load
duke
parents:
diff changeset
   863
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   864
    private ListBuffer<Symbol> accessed;
06bc494ca11e Initial load
duke
parents:
diff changeset
   865
06bc494ca11e Initial load
duke
parents:
diff changeset
   866
    /** Map bytecode of binary operation to access code of corresponding
06bc494ca11e Initial load
duke
parents:
diff changeset
   867
     *  assignment operation. This is always an even number.
06bc494ca11e Initial load
duke
parents:
diff changeset
   868
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   869
    private static int accessCode(int bytecode) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   870
        if (ByteCodes.iadd <= bytecode && bytecode <= ByteCodes.lxor)
06bc494ca11e Initial load
duke
parents:
diff changeset
   871
            return (bytecode - iadd) * 2 + FIRSTASGOPcode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   872
        else if (bytecode == ByteCodes.string_add)
06bc494ca11e Initial load
duke
parents:
diff changeset
   873
            return (ByteCodes.lxor + 1 - iadd) * 2 + FIRSTASGOPcode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   874
        else if (ByteCodes.ishll <= bytecode && bytecode <= ByteCodes.lushrl)
06bc494ca11e Initial load
duke
parents:
diff changeset
   875
            return (bytecode - ishll + ByteCodes.lxor + 2 - iadd) * 2 + FIRSTASGOPcode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   876
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
   877
            return -1;
06bc494ca11e Initial load
duke
parents:
diff changeset
   878
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   879
06bc494ca11e Initial load
duke
parents:
diff changeset
   880
    /** return access code for identifier,
06bc494ca11e Initial load
duke
parents:
diff changeset
   881
     *  @param tree     The tree representing the identifier use.
06bc494ca11e Initial load
duke
parents:
diff changeset
   882
     *  @param enclOp   The closest enclosing operation node of tree,
06bc494ca11e Initial load
duke
parents:
diff changeset
   883
     *                  null if tree is not a subtree of an operation.
06bc494ca11e Initial load
duke
parents:
diff changeset
   884
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   885
    private static int accessCode(JCTree tree, JCTree enclOp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   886
        if (enclOp == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
   887
            return DEREFcode;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   888
        else if (enclOp.hasTag(ASSIGN) &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   889
                 tree == TreeInfo.skipParens(((JCAssign) enclOp).lhs))
06bc494ca11e Initial load
duke
parents:
diff changeset
   890
            return ASSIGNcode;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   891
        else if (enclOp.getTag().isIncOrDecUnaryOp() &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   892
                 tree == TreeInfo.skipParens(((JCUnary) enclOp).arg))
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   893
            return mapTagToUnaryOpCode(enclOp.getTag());
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   894
        else if (enclOp.getTag().isAssignop() &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   895
                 tree == TreeInfo.skipParens(((JCAssignOp) enclOp).lhs))
06bc494ca11e Initial load
duke
parents:
diff changeset
   896
            return accessCode(((OperatorSymbol) ((JCAssignOp) enclOp).operator).opcode);
06bc494ca11e Initial load
duke
parents:
diff changeset
   897
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
   898
            return DEREFcode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   899
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   900
06bc494ca11e Initial load
duke
parents:
diff changeset
   901
    /** Return binary operator that corresponds to given access code.
06bc494ca11e Initial load
duke
parents:
diff changeset
   902
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   903
    private OperatorSymbol binaryAccessOperator(int acode) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   904
        for (Scope.Entry e = syms.predefClass.members().elems;
06bc494ca11e Initial load
duke
parents:
diff changeset
   905
             e != null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   906
             e = e.sibling) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   907
            if (e.sym instanceof OperatorSymbol) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   908
                OperatorSymbol op = (OperatorSymbol)e.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   909
                if (accessCode(op.opcode) == acode) return op;
06bc494ca11e Initial load
duke
parents:
diff changeset
   910
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   911
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   912
        return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   913
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   914
06bc494ca11e Initial load
duke
parents:
diff changeset
   915
    /** Return tree tag for assignment operation corresponding
06bc494ca11e Initial load
duke
parents:
diff changeset
   916
     *  to given binary operator.
06bc494ca11e Initial load
duke
parents:
diff changeset
   917
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   918
    private static JCTree.Tag treeTag(OperatorSymbol operator) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   919
        switch (operator.opcode) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   920
        case ByteCodes.ior: case ByteCodes.lor:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   921
            return BITOR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   922
        case ByteCodes.ixor: case ByteCodes.lxor:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   923
            return BITXOR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   924
        case ByteCodes.iand: case ByteCodes.land:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   925
            return BITAND_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   926
        case ByteCodes.ishl: case ByteCodes.lshl:
06bc494ca11e Initial load
duke
parents:
diff changeset
   927
        case ByteCodes.ishll: case ByteCodes.lshll:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   928
            return SL_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   929
        case ByteCodes.ishr: case ByteCodes.lshr:
06bc494ca11e Initial load
duke
parents:
diff changeset
   930
        case ByteCodes.ishrl: case ByteCodes.lshrl:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   931
            return SR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   932
        case ByteCodes.iushr: case ByteCodes.lushr:
06bc494ca11e Initial load
duke
parents:
diff changeset
   933
        case ByteCodes.iushrl: case ByteCodes.lushrl:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   934
            return USR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   935
        case ByteCodes.iadd: case ByteCodes.ladd:
06bc494ca11e Initial load
duke
parents:
diff changeset
   936
        case ByteCodes.fadd: case ByteCodes.dadd:
06bc494ca11e Initial load
duke
parents:
diff changeset
   937
        case ByteCodes.string_add:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   938
            return PLUS_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   939
        case ByteCodes.isub: case ByteCodes.lsub:
06bc494ca11e Initial load
duke
parents:
diff changeset
   940
        case ByteCodes.fsub: case ByteCodes.dsub:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   941
            return MINUS_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   942
        case ByteCodes.imul: case ByteCodes.lmul:
06bc494ca11e Initial load
duke
parents:
diff changeset
   943
        case ByteCodes.fmul: case ByteCodes.dmul:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   944
            return MUL_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   945
        case ByteCodes.idiv: case ByteCodes.ldiv:
06bc494ca11e Initial load
duke
parents:
diff changeset
   946
        case ByteCodes.fdiv: case ByteCodes.ddiv:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   947
            return DIV_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   948
        case ByteCodes.imod: case ByteCodes.lmod:
06bc494ca11e Initial load
duke
parents:
diff changeset
   949
        case ByteCodes.fmod: case ByteCodes.dmod:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
   950
            return MOD_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   951
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   952
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
   953
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   954
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   955
06bc494ca11e Initial load
duke
parents:
diff changeset
   956
    /** The name of the access method with number `anum' and access code `acode'.
06bc494ca11e Initial load
duke
parents:
diff changeset
   957
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   958
    Name accessName(int anum, int acode) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   959
        return names.fromString(
06bc494ca11e Initial load
duke
parents:
diff changeset
   960
            "access" + target.syntheticNameChar() + anum + acode / 10 + acode % 10);
06bc494ca11e Initial load
duke
parents:
diff changeset
   961
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   962
06bc494ca11e Initial load
duke
parents:
diff changeset
   963
    /** Return access symbol for a private or protected symbol from an inner class.
06bc494ca11e Initial load
duke
parents:
diff changeset
   964
     *  @param sym        The accessed private symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
   965
     *  @param tree       The accessing tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
   966
     *  @param enclOp     The closest enclosing operation node of tree,
06bc494ca11e Initial load
duke
parents:
diff changeset
   967
     *                    null if tree is not a subtree of an operation.
06bc494ca11e Initial load
duke
parents:
diff changeset
   968
     *  @param protAccess Is access to a protected symbol in another
06bc494ca11e Initial load
duke
parents:
diff changeset
   969
     *                    package?
06bc494ca11e Initial load
duke
parents:
diff changeset
   970
     *  @param refSuper   Is access via a (qualified) C.super?
06bc494ca11e Initial load
duke
parents:
diff changeset
   971
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   972
    MethodSymbol accessSymbol(Symbol sym, JCTree tree, JCTree enclOp,
06bc494ca11e Initial load
duke
parents:
diff changeset
   973
                              boolean protAccess, boolean refSuper) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   974
        ClassSymbol accOwner = refSuper && protAccess
06bc494ca11e Initial load
duke
parents:
diff changeset
   975
            // For access via qualified super (T.super.x), place the
06bc494ca11e Initial load
duke
parents:
diff changeset
   976
            // access symbol on T.
06bc494ca11e Initial load
duke
parents:
diff changeset
   977
            ? (ClassSymbol)((JCFieldAccess) tree).selected.type.tsym
06bc494ca11e Initial load
duke
parents:
diff changeset
   978
            // Otherwise pretend that the owner of an accessed
06bc494ca11e Initial load
duke
parents:
diff changeset
   979
            // protected symbol is the enclosing class of the current
06bc494ca11e Initial load
duke
parents:
diff changeset
   980
            // class which is a subclass of the symbol's owner.
06bc494ca11e Initial load
duke
parents:
diff changeset
   981
            : accessClass(sym, protAccess, tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   982
06bc494ca11e Initial load
duke
parents:
diff changeset
   983
        Symbol vsym = sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
   984
        if (sym.owner != accOwner) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   985
            vsym = sym.clone(accOwner);
06bc494ca11e Initial load
duke
parents:
diff changeset
   986
            actualSymbols.put(vsym, sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   987
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   988
06bc494ca11e Initial load
duke
parents:
diff changeset
   989
        Integer anum              // The access number of the access method.
06bc494ca11e Initial load
duke
parents:
diff changeset
   990
            = accessNums.get(vsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   991
        if (anum == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   992
            anum = accessed.length();
06bc494ca11e Initial load
duke
parents:
diff changeset
   993
            accessNums.put(vsym, anum);
06bc494ca11e Initial load
duke
parents:
diff changeset
   994
            accessSyms.put(vsym, new MethodSymbol[NCODES]);
06bc494ca11e Initial load
duke
parents:
diff changeset
   995
            accessed.append(vsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
   996
            // System.out.println("accessing " + vsym + " in " + vsym.location());
06bc494ca11e Initial load
duke
parents:
diff changeset
   997
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   998
06bc494ca11e Initial load
duke
parents:
diff changeset
   999
        int acode;                // The access code of the access method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1000
        List<Type> argtypes;      // The argument types of the access method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1001
        Type restype;             // The result type of the access method.
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  1002
        List<Type> thrown;        // The thrown exceptions of the access method.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1003
        switch (vsym.kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1004
        case VAR:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1005
            acode = accessCode(tree, enclOp);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1006
            if (acode >= FIRSTASGOPcode) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1007
                OperatorSymbol operator = binaryAccessOperator(acode);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1008
                if (operator.opcode == string_add)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1009
                    argtypes = List.of(syms.objectType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1010
                else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1011
                    argtypes = operator.type.getParameterTypes().tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1012
            } else if (acode == ASSIGNcode)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1013
                argtypes = List.of(vsym.erasure(types));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1014
            else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1015
                argtypes = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1016
            restype = vsym.erasure(types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1017
            thrown = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1018
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1019
        case MTH:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1020
            acode = DEREFcode;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1021
            argtypes = vsym.erasure(types).getParameterTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1022
            restype = vsym.erasure(types).getReturnType();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1023
            thrown = vsym.type.getThrownTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1024
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1025
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1026
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1027
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1028
06bc494ca11e Initial load
duke
parents:
diff changeset
  1029
        // For references via qualified super, increment acode by one,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1030
        // making it odd.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1031
        if (protAccess && refSuper) acode++;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1032
06bc494ca11e Initial load
duke
parents:
diff changeset
  1033
        // Instance access methods get instance as first parameter.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1034
        // For protected symbols this needs to be the instance as a member
06bc494ca11e Initial load
duke
parents:
diff changeset
  1035
        // of the type containing the accessed symbol, not the class
06bc494ca11e Initial load
duke
parents:
diff changeset
  1036
        // containing the access method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1037
        if ((vsym.flags() & STATIC) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1038
            argtypes = argtypes.prepend(vsym.owner.erasure(types));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1039
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1040
        MethodSymbol[] accessors = accessSyms.get(vsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1041
        MethodSymbol accessor = accessors[acode];
06bc494ca11e Initial load
duke
parents:
diff changeset
  1042
        if (accessor == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1043
            accessor = new MethodSymbol(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1044
                STATIC | SYNTHETIC,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1045
                accessName(anum.intValue(), acode),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1046
                new MethodType(argtypes, restype, thrown, syms.methodClass),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1047
                accOwner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1048
            enterSynthetic(tree.pos(), accessor, accOwner.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1049
            accessors[acode] = accessor;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1050
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1051
        return accessor;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1052
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1053
06bc494ca11e Initial load
duke
parents:
diff changeset
  1054
    /** The qualifier to be used for accessing a symbol in an outer class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1055
     *  This is either C.sym or C.this.sym, depending on whether or not
06bc494ca11e Initial load
duke
parents:
diff changeset
  1056
     *  sym is static.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1057
     *  @param sym   The accessed symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1058
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1059
    JCExpression accessBase(DiagnosticPosition pos, Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1060
        return (sym.flags() & STATIC) != 0
06bc494ca11e Initial load
duke
parents:
diff changeset
  1061
            ? access(make.at(pos.getStartPosition()).QualIdent(sym.owner))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1062
            : makeOwnerThis(pos, sym, true);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1063
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1064
06bc494ca11e Initial load
duke
parents:
diff changeset
  1065
    /** Do we need an access method to reference private symbol?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1066
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1067
    boolean needsPrivateAccess(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1068
        if ((sym.flags() & PRIVATE) == 0 || sym.owner == currentClass) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1069
            return false;
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
  1070
        } else if (sym.name == names.init && sym.owner.isLocal()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1071
            // private constructor in local class: relax protection
06bc494ca11e Initial load
duke
parents:
diff changeset
  1072
            sym.flags_field &= ~PRIVATE;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1073
            return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1074
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1075
            return true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1076
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1077
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1078
06bc494ca11e Initial load
duke
parents:
diff changeset
  1079
    /** Do we need an access method to reference symbol in other package?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1080
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1081
    boolean needsProtectedAccess(Symbol sym, JCTree tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1082
        if ((sym.flags() & PROTECTED) == 0 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  1083
            sym.owner.owner == currentClass.owner || // fast special case
06bc494ca11e Initial load
duke
parents:
diff changeset
  1084
            sym.packge() == currentClass.packge())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1085
            return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1086
        if (!currentClass.isSubClass(sym.owner, types))
06bc494ca11e Initial load
duke
parents:
diff changeset
  1087
            return true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1088
        if ((sym.flags() & STATIC) != 0 ||
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1089
            !tree.hasTag(SELECT) ||
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1090
            TreeInfo.name(((JCFieldAccess) tree).selected) == names._super)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1091
            return false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1092
        return !((JCFieldAccess) tree).selected.type.tsym.isSubClass(currentClass, types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1093
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1094
06bc494ca11e Initial load
duke
parents:
diff changeset
  1095
    /** The class in which an access method for given symbol goes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1096
     *  @param sym        The access symbol
06bc494ca11e Initial load
duke
parents:
diff changeset
  1097
     *  @param protAccess Is access to a protected symbol in another
06bc494ca11e Initial load
duke
parents:
diff changeset
  1098
     *                    package?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1099
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1100
    ClassSymbol accessClass(Symbol sym, boolean protAccess, JCTree tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1101
        if (protAccess) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1102
            Symbol qualifier = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1103
            ClassSymbol c = currentClass;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1104
            if (tree.hasTag(SELECT) && (sym.flags() & STATIC) == 0) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1105
                qualifier = ((JCFieldAccess) tree).selected.type.tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1106
                while (!qualifier.isSubClass(c, types)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1107
                    c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1108
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1109
                return c;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1110
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1111
                while (!c.isSubClass(sym.owner, types)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1112
                    c = c.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1113
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1114
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1115
            return c;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1116
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1117
            // the symbol is private
06bc494ca11e Initial load
duke
parents:
diff changeset
  1118
            return sym.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1119
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1120
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1121
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1122
    private void addPrunedInfo(JCTree tree) {
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1123
        List<JCTree> infoList = prunedTree.get(currentClass);
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1124
        infoList = (infoList == null) ? List.of(tree) : infoList.prepend(tree);
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1125
        prunedTree.put(currentClass, infoList);
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1126
    }
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1127
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1128
    /** Ensure that identifier is accessible, return tree accessing the identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1129
     *  @param sym      The accessed symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1130
     *  @param tree     The tree referring to the symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1131
     *  @param enclOp   The closest enclosing operation node of tree,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1132
     *                  null if tree is not a subtree of an operation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1133
     *  @param refSuper Is access via a (qualified) C.super?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1134
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1135
    JCExpression access(Symbol sym, JCExpression tree, JCExpression enclOp, boolean refSuper) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1136
        // Access a free variable via its proxy, or its proxy's proxy
06bc494ca11e Initial load
duke
parents:
diff changeset
  1137
        while (sym.kind == VAR && sym.owner.kind == MTH &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1138
            sym.owner.enclClass() != currentClass) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1139
            // A constant is replaced by its constant value.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1140
            Object cv = ((VarSymbol)sym).getConstValue();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1141
            if (cv != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1142
                make.at(tree.pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1143
                return makeLit(sym.type, cv);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1144
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1145
            // Otherwise replace the variable by its proxy.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1146
            sym = proxies.lookup(proxyName(sym.name)).sym;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1147
            Assert.check(sym != null && (sym.flags_field & FINAL) != 0);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1148
            tree = make.at(tree.pos).Ident(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1149
        }
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1150
        JCExpression base = (tree.hasTag(SELECT)) ? ((JCFieldAccess) tree).selected : null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1151
        switch (sym.kind) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1152
        case TYP:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1153
            if (sym.owner.kind != PCK) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1154
                // Convert type idents to
06bc494ca11e Initial load
duke
parents:
diff changeset
  1155
                // <flat name> or <package name> . <flat name>
06bc494ca11e Initial load
duke
parents:
diff changeset
  1156
                Name flatname = Convert.shortName(sym.flatName());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1157
                while (base != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1158
                       TreeInfo.symbol(base) != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1159
                       TreeInfo.symbol(base).kind != PCK) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1160
                    base = (base.hasTag(SELECT))
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1161
                        ? ((JCFieldAccess) base).selected
06bc494ca11e Initial load
duke
parents:
diff changeset
  1162
                        : null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1163
                }
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1164
                if (tree.hasTag(IDENT)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1165
                    ((JCIdent) tree).name = flatname;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1166
                } else if (base == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1167
                    tree = make.at(tree.pos).Ident(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1168
                    ((JCIdent) tree).name = flatname;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1169
                } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1170
                    ((JCFieldAccess) tree).selected = base;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1171
                    ((JCFieldAccess) tree).name = flatname;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1172
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1173
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1174
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1175
        case MTH: case VAR:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1176
            if (sym.owner.kind == TYP) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1177
06bc494ca11e Initial load
duke
parents:
diff changeset
  1178
                // Access methods are required for
06bc494ca11e Initial load
duke
parents:
diff changeset
  1179
                //  - private members,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1180
                //  - protected members in a superclass of an
06bc494ca11e Initial load
duke
parents:
diff changeset
  1181
                //    enclosing class contained in another package.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1182
                //  - all non-private members accessed via a qualified super.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1183
                boolean protAccess = refSuper && !needsPrivateAccess(sym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1184
                    || needsProtectedAccess(sym, tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1185
                boolean accReq = protAccess || needsPrivateAccess(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1186
06bc494ca11e Initial load
duke
parents:
diff changeset
  1187
                // A base has to be supplied for
06bc494ca11e Initial load
duke
parents:
diff changeset
  1188
                //  - simple identifiers accessing variables in outer classes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1189
                boolean baseReq =
06bc494ca11e Initial load
duke
parents:
diff changeset
  1190
                    base == null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1191
                    sym.owner != syms.predefClass &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1192
                    !sym.isMemberOf(currentClass, types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1193
06bc494ca11e Initial load
duke
parents:
diff changeset
  1194
                if (accReq || baseReq) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1195
                    make.at(tree.pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1196
06bc494ca11e Initial load
duke
parents:
diff changeset
  1197
                    // Constants are replaced by their constant value.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1198
                    if (sym.kind == VAR) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1199
                        Object cv = ((VarSymbol)sym).getConstValue();
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1200
                        if (cv != null) {
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1201
                            addPrunedInfo(tree);
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1202
                            return makeLit(sym.type, cv);
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  1203
                        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1204
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1205
06bc494ca11e Initial load
duke
parents:
diff changeset
  1206
                    // Private variables and methods are replaced by calls
06bc494ca11e Initial load
duke
parents:
diff changeset
  1207
                    // to their access methods.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1208
                    if (accReq) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1209
                        List<JCExpression> args = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1210
                        if ((sym.flags() & STATIC) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1211
                            // Instance access methods get instance
06bc494ca11e Initial load
duke
parents:
diff changeset
  1212
                            // as first parameter.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1213
                            if (base == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1214
                                base = makeOwnerThis(tree.pos(), sym, true);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1215
                            args = args.prepend(base);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1216
                            base = null;   // so we don't duplicate code
06bc494ca11e Initial load
duke
parents:
diff changeset
  1217
                        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1218
                        Symbol access = accessSymbol(sym, tree,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1219
                                                     enclOp, protAccess,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1220
                                                     refSuper);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1221
                        JCExpression receiver = make.Select(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1222
                            base != null ? base : make.QualIdent(access.owner),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1223
                            access);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1224
                        return make.App(receiver, args);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1225
06bc494ca11e Initial load
duke
parents:
diff changeset
  1226
                    // Other accesses to members of outer classes get a
06bc494ca11e Initial load
duke
parents:
diff changeset
  1227
                    // qualifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1228
                    } else if (baseReq) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1229
                        return make.at(tree.pos).Select(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1230
                            accessBase(tree.pos(), sym), sym).setType(tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1231
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1232
                }
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1233
            } else if (sym.owner.kind == MTH && lambdaTranslationMap != null) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1234
                //sym is a local variable - check the lambda translation map to
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1235
                //see if sym has been translated to something else in the current
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1236
                //scope (by LambdaToMethod)
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1237
                Symbol translatedSym = lambdaTranslationMap.get(sym);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1238
                if (translatedSym != null) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1239
                    tree = make.at(tree.pos).Ident(translatedSym);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  1240
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1241
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1242
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1243
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1244
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1245
06bc494ca11e Initial load
duke
parents:
diff changeset
  1246
    /** Ensure that identifier is accessible, return tree accessing the identifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1247
     *  @param tree     The identifier tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1248
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1249
    JCExpression access(JCExpression tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1250
        Symbol sym = TreeInfo.symbol(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1251
        return sym == null ? tree : access(sym, tree, null, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1252
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1253
06bc494ca11e Initial load
duke
parents:
diff changeset
  1254
    /** Return access constructor for a private constructor,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1255
     *  or the constructor itself, if no access constructor is needed.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1256
     *  @param pos       The position to report diagnostics, if any.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1257
     *  @param constr    The private constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1258
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1259
    Symbol accessConstructor(DiagnosticPosition pos, Symbol constr) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1260
        if (needsPrivateAccess(constr)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1261
            ClassSymbol accOwner = constr.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1262
            MethodSymbol aconstr = accessConstrs.get(constr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1263
            if (aconstr == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1264
                List<Type> argtypes = constr.type.getParameterTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1265
                if ((accOwner.flags_field & ENUM) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1266
                    argtypes = argtypes
06bc494ca11e Initial load
duke
parents:
diff changeset
  1267
                        .prepend(syms.intType)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1268
                        .prepend(syms.stringType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1269
                aconstr = new MethodSymbol(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1270
                    SYNTHETIC,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1271
                    names.init,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1272
                    new MethodType(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1273
                        argtypes.append(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1274
                            accessConstructorTag().erasure(types)),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1275
                        constr.type.getReturnType(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1276
                        constr.type.getThrownTypes(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1277
                        syms.methodClass),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1278
                    accOwner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1279
                enterSynthetic(pos, aconstr, accOwner.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1280
                accessConstrs.put(constr, aconstr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1281
                accessed.append(constr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1282
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1283
            return aconstr;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1284
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1285
            return constr;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1286
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1287
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1288
06bc494ca11e Initial load
duke
parents:
diff changeset
  1289
    /** Return an anonymous class nested in this toplevel class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1290
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1291
    ClassSymbol accessConstructorTag() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1292
        ClassSymbol topClass = currentClass.outermostClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1293
        Name flatname = names.fromString("" + topClass.getQualifiedName() +
06bc494ca11e Initial load
duke
parents:
diff changeset
  1294
                                         target.syntheticNameChar() +
06bc494ca11e Initial load
duke
parents:
diff changeset
  1295
                                         "1");
06bc494ca11e Initial load
duke
parents:
diff changeset
  1296
        ClassSymbol ctag = chk.compiled.get(flatname);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1297
        if (ctag == null)
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
  1298
            ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass).sym;
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
  1299
        // keep a record of all tags, to verify that all are generated as required
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
  1300
        accessConstrTags = accessConstrTags.prepend(ctag);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1301
        return ctag;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1302
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1303
06bc494ca11e Initial load
duke
parents:
diff changeset
  1304
    /** Add all required access methods for a private symbol to enclosing class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1305
     *  @param sym       The symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1306
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1307
    void makeAccessible(Symbol sym) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1308
        JCClassDecl cdef = classDef(sym.owner.enclClass());
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1309
        if (cdef == null) Assert.error("class def not found: " + sym + " in " + sym.owner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1310
        if (sym.name == names.init) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1311
            cdef.defs = cdef.defs.prepend(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1312
                accessConstructorDef(cdef.pos, sym, accessConstrs.get(sym)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1313
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1314
            MethodSymbol[] accessors = accessSyms.get(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1315
            for (int i = 0; i < NCODES; i++) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1316
                if (accessors[i] != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1317
                    cdef.defs = cdef.defs.prepend(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1318
                        accessDef(cdef.pos, sym, accessors[i], i));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1319
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1320
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1321
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1322
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1323
    /** Maps unary operator integer codes to JCTree.Tag objects
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1324
     *  @param unaryOpCode the unary operator code
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1325
     */
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1326
    private static Tag mapUnaryOpCodeToTag(int unaryOpCode){
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1327
        switch (unaryOpCode){
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1328
            case PREINCcode:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1329
                return PREINC;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1330
            case PREDECcode:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1331
                return PREDEC;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1332
            case POSTINCcode:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1333
                return POSTINC;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1334
            case POSTDECcode:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1335
                return POSTDEC;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1336
            default:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1337
                return NO_TAG;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1338
        }
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1339
    }
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1340
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1341
    /** Maps JCTree.Tag objects to unary operator integer codes
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1342
     *  @param tag the JCTree.Tag
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1343
     */
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1344
    private static int mapTagToUnaryOpCode(Tag tag){
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1345
        switch (tag){
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1346
            case PREINC:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1347
                return PREINCcode;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1348
            case PREDEC:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1349
                return PREDECcode;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1350
            case POSTINC:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1351
                return POSTINCcode;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1352
            case POSTDEC:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1353
                return POSTDECcode;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1354
            default:
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1355
                return -1;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1356
        }
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1357
    }
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1358
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1359
    /** Construct definition of an access method.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1360
     *  @param pos        The source code position of the definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1361
     *  @param vsym       The private or protected symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1362
     *  @param accessor   The access method for the symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1363
     *  @param acode      The access code.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1364
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1365
    JCTree accessDef(int pos, Symbol vsym, MethodSymbol accessor, int acode) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1366
//      System.err.println("access " + vsym + " with " + accessor);//DEBUG
06bc494ca11e Initial load
duke
parents:
diff changeset
  1367
        currentClass = vsym.owner.enclClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1368
        make.at(pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1369
        JCMethodDecl md = make.MethodDef(accessor, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1370
06bc494ca11e Initial load
duke
parents:
diff changeset
  1371
        // Find actual symbol
06bc494ca11e Initial load
duke
parents:
diff changeset
  1372
        Symbol sym = actualSymbols.get(vsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1373
        if (sym == null) sym = vsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1374
06bc494ca11e Initial load
duke
parents:
diff changeset
  1375
        JCExpression ref;           // The tree referencing the private symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1376
        List<JCExpression> args;    // Any additional arguments to be passed along.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1377
        if ((sym.flags() & STATIC) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1378
            ref = make.Ident(sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1379
            args = make.Idents(md.params);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1380
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1381
            ref = make.Select(make.Ident(md.params.head), sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1382
            args = make.Idents(md.params.tail);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1383
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1384
        JCStatement stat;          // The statement accessing the private symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1385
        if (sym.kind == VAR) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1386
            // Normalize out all odd access codes by taking floor modulo 2:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1387
            int acode1 = acode - (acode & 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1388
06bc494ca11e Initial load
duke
parents:
diff changeset
  1389
            JCExpression expr;      // The access method's return value.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1390
            switch (acode1) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1391
            case DEREFcode:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1392
                expr = ref;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1393
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1394
            case ASSIGNcode:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1395
                expr = make.Assign(ref, args.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1396
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1397
            case PREINCcode: case POSTINCcode: case PREDECcode: case POSTDECcode:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1398
                expr = makeUnary(mapUnaryOpCodeToTag(acode1), ref);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1399
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1400
            default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1401
                expr = make.Assignop(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1402
                    treeTag(binaryAccessOperator(acode1)), ref, args.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1403
                ((JCAssignOp) expr).operator = binaryAccessOperator(acode1);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1404
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1405
            stat = make.Return(expr.setType(sym.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1406
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1407
            stat = make.Call(make.App(ref, args));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1408
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1409
        md.body = make.Block(0, List.of(stat));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1410
06bc494ca11e Initial load
duke
parents:
diff changeset
  1411
        // Make sure all parameters, result types and thrown exceptions
06bc494ca11e Initial load
duke
parents:
diff changeset
  1412
        // are accessible.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1413
        for (List<JCVariableDecl> l = md.params; l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1414
            l.head.vartype = access(l.head.vartype);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1415
        md.restype = access(md.restype);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1416
        for (List<JCExpression> l = md.thrown; l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1417
            l.head = access(l.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1418
06bc494ca11e Initial load
duke
parents:
diff changeset
  1419
        return md;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1420
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1421
06bc494ca11e Initial load
duke
parents:
diff changeset
  1422
    /** Construct definition of an access constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1423
     *  @param pos        The source code position of the definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1424
     *  @param constr     The private constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1425
     *  @param accessor   The access method for the constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1426
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1427
    JCTree accessConstructorDef(int pos, Symbol constr, MethodSymbol accessor) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1428
        make.at(pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1429
        JCMethodDecl md = make.MethodDef(accessor,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1430
                                      accessor.externalType(types),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1431
                                      null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1432
        JCIdent callee = make.Ident(names._this);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1433
        callee.sym = constr;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1434
        callee.type = constr.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1435
        md.body =
06bc494ca11e Initial load
duke
parents:
diff changeset
  1436
            make.Block(0, List.<JCStatement>of(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1437
                make.Call(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1438
                    make.App(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1439
                        callee,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1440
                        make.Idents(md.params.reverse().tail.reverse())))));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1441
        return md;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1442
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1443
06bc494ca11e Initial load
duke
parents:
diff changeset
  1444
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1445
 * Free variables proxies and this$n
06bc494ca11e Initial load
duke
parents:
diff changeset
  1446
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1447
06bc494ca11e Initial load
duke
parents:
diff changeset
  1448
    /** A scope containing all free variable proxies for currently translated
06bc494ca11e Initial load
duke
parents:
diff changeset
  1449
     *  class, as well as its this$n symbol (if needed).
06bc494ca11e Initial load
duke
parents:
diff changeset
  1450
     *  Proxy scopes are nested in the same way classes are.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1451
     *  Inside a constructor, proxies and any this$n symbol are duplicated
06bc494ca11e Initial load
duke
parents:
diff changeset
  1452
     *  in an additional innermost scope, where they represent the constructor
06bc494ca11e Initial load
duke
parents:
diff changeset
  1453
     *  parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1454
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1455
    Scope proxies;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1456
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1457
    /** A scope containing all unnamed resource variables/saved
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1458
     *  exception variables for translated TWR blocks
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1459
     */
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1460
    Scope twrVars;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1461
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1462
    /** A stack containing the this$n field of the currently translated
06bc494ca11e Initial load
duke
parents:
diff changeset
  1463
     *  classes (if needed) in innermost first order.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1464
     *  Inside a constructor, proxies and any this$n symbol are duplicated
06bc494ca11e Initial load
duke
parents:
diff changeset
  1465
     *  in an additional innermost scope, where they represent the constructor
06bc494ca11e Initial load
duke
parents:
diff changeset
  1466
     *  parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1467
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1468
    List<VarSymbol> outerThisStack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1469
06bc494ca11e Initial load
duke
parents:
diff changeset
  1470
    /** The name of a free variable proxy.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1471
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1472
    Name proxyName(Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1473
        return names.fromString("val" + target.syntheticNameChar() + name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1474
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1475
06bc494ca11e Initial load
duke
parents:
diff changeset
  1476
    /** Proxy definitions for all free variables in given list, in reverse order.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1477
     *  @param pos        The source code position of the definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1478
     *  @param freevars   The free variables.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1479
     *  @param owner      The class in which the definitions go.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1480
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1481
    List<JCVariableDecl> freevarDefs(int pos, List<VarSymbol> freevars, Symbol owner) {
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1482
        return freevarDefs(pos, freevars, owner, 0);
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1483
    }
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1484
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1485
    List<JCVariableDecl> freevarDefs(int pos, List<VarSymbol> freevars, Symbol owner,
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1486
            long additionalFlags) {
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1487
        long flags = FINAL | SYNTHETIC | additionalFlags;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1488
        if (owner.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1489
            target.usePrivateSyntheticFields())
06bc494ca11e Initial load
duke
parents:
diff changeset
  1490
            flags |= PRIVATE;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1491
        List<JCVariableDecl> defs = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1492
        for (List<VarSymbol> l = freevars; l.nonEmpty(); l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1493
            VarSymbol v = l.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1494
            VarSymbol proxy = new VarSymbol(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1495
                flags, proxyName(v.name), v.erasure(types), owner);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1496
            proxies.enter(proxy);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1497
            JCVariableDecl vd = make.at(pos).VarDef(proxy, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1498
            vd.vartype = access(vd.vartype);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1499
            defs = defs.prepend(vd);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1500
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1501
        return defs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1502
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1503
06bc494ca11e Initial load
duke
parents:
diff changeset
  1504
    /** The name of a this$n field
06bc494ca11e Initial load
duke
parents:
diff changeset
  1505
     *  @param type   The class referenced by the this$n field
06bc494ca11e Initial load
duke
parents:
diff changeset
  1506
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1507
    Name outerThisName(Type type, Symbol owner) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1508
        Type t = type.getEnclosingType();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1509
        int nestingLevel = 0;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
  1510
        while (t.hasTag(CLASS)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1511
            t = t.getEnclosingType();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1512
            nestingLevel++;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1513
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1514
        Name result = names.fromString("this" + target.syntheticNameChar() + nestingLevel);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1515
        while (owner.kind == TYP && ((ClassSymbol)owner).members().lookup(result).scope != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1516
            result = names.fromString(result.toString() + target.syntheticNameChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1517
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1518
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1519
15720
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1520
    private VarSymbol makeOuterThisVarSymbol(Symbol owner, long flags) {
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1521
        if (owner.kind == TYP &&
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1522
            target.usePrivateSyntheticFields())
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1523
            flags |= PRIVATE;
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1524
        Type target = types.erasure(owner.enclClass().type.getEnclosingType());
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1525
        VarSymbol outerThis =
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1526
            new VarSymbol(flags, outerThisName(target, owner), target, owner);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1527
        outerThisStack = outerThisStack.prepend(outerThis);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1528
        return outerThis;
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1529
    }
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1530
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1531
    private JCVariableDecl makeOuterThisVarDecl(int pos, VarSymbol sym) {
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1532
        JCVariableDecl vd = make.at(pos).VarDef(sym, null);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1533
        vd.vartype = access(vd.vartype);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1534
        return vd;
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1535
    }
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1536
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1537
    /** Definition for this$n field.
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1538
     *  @param pos        The source code position of the definition.
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1539
     *  @param owner      The method in which the definition goes.
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1540
     */
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1541
    JCVariableDecl outerThisDef(int pos, MethodSymbol owner) {
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1542
        ClassSymbol c = owner.enclClass();
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1543
        boolean isMandated =
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1544
            // Anonymous constructors
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1545
            (owner.isConstructor() && owner.isAnonymous()) ||
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1546
            // Constructors of non-private inner member classes
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1547
            (owner.isConstructor() && c.isInner() &&
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1548
             !c.isPrivate() && !c.isStatic());
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1549
        long flags =
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1550
            FINAL | (isMandated ? MANDATED : SYNTHETIC) | PARAMETER;
15720
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1551
        VarSymbol outerThis = makeOuterThisVarSymbol(owner, flags);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1552
        owner.extraParams = owner.extraParams.prepend(outerThis);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1553
        return makeOuterThisVarDecl(pos, outerThis);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1554
    }
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1555
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1556
    /** Definition for this$n field.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1557
     *  @param pos        The source code position of the definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1558
     *  @param owner      The class in which the definition goes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1559
     */
15720
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1560
    JCVariableDecl outerThisDef(int pos, ClassSymbol owner) {
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1561
        VarSymbol outerThis = makeOuterThisVarSymbol(owner, FINAL | SYNTHETIC);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  1562
        return makeOuterThisVarDecl(pos, outerThis);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1563
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1564
06bc494ca11e Initial load
duke
parents:
diff changeset
  1565
    /** Return a list of trees that load the free variables in given list,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1566
     *  in reverse order.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1567
     *  @param pos          The source code position to be used for the trees.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1568
     *  @param freevars     The list of free variables.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1569
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1570
    List<JCExpression> loadFreevars(DiagnosticPosition pos, List<VarSymbol> freevars) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1571
        List<JCExpression> args = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1572
        for (List<VarSymbol> l = freevars; l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1573
            args = args.prepend(loadFreevar(pos, l.head));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1574
        return args;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1575
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1576
//where
06bc494ca11e Initial load
duke
parents:
diff changeset
  1577
        JCExpression loadFreevar(DiagnosticPosition pos, VarSymbol v) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1578
            return access(v, make.at(pos).Ident(v), null, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1579
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1580
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  1581
    /** Construct a tree simulating the expression {@code C.this}.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1582
     *  @param pos           The source code position to be used for the tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1583
     *  @param c             The qualifier class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1584
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1585
    JCExpression makeThis(DiagnosticPosition pos, TypeSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1586
        if (currentClass == c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1587
            // in this case, `this' works fine
06bc494ca11e Initial load
duke
parents:
diff changeset
  1588
            return make.at(pos).This(c.erasure(types));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1589
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1590
            // need to go via this$n
06bc494ca11e Initial load
duke
parents:
diff changeset
  1591
            return makeOuterThis(pos, c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1592
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1593
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1594
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1595
    /**
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1596
     * Optionally replace a try statement with the desugaring of a
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1597
     * try-with-resources statement.  The canonical desugaring of
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1598
     *
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1599
     * try ResourceSpecification
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1600
     *   Block
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1601
     *
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1602
     * is
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1603
     *
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1604
     * {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1605
     *   final VariableModifiers_minus_final R #resource = Expression;
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1606
     *   Throwable #primaryException = null;
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1607
     *
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1608
     *   try ResourceSpecificationtail
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1609
     *     Block
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1610
     *   catch (Throwable #t) {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1611
     *     #primaryException = t;
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1612
     *     throw #t;
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1613
     *   } finally {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1614
     *     if (#resource != null) {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1615
     *       if (#primaryException != null) {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1616
     *         try {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1617
     *           #resource.close();
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1618
     *         } catch(Throwable #suppressedException) {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1619
     *           #primaryException.addSuppressed(#suppressedException);
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1620
     *         }
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1621
     *       } else {
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1622
     *         #resource.close();
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1623
     *       }
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1624
     *     }
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1625
     *   }
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1626
     *
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1627
     * @param tree  The try statement to inspect.
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1628
     * @return A a desugared try-with-resources tree, or the original
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1629
     * try block if there are no resources to manage.
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1630
     */
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1631
    JCTree makeTwrTry(JCTry tree) {
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1632
        make_at(tree.pos());
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1633
        twrVars = twrVars.dup();
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1634
        JCBlock twrBlock = makeTwrBlock(tree.resources, tree.body,
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1635
                tree.finallyCanCompleteNormally, 0);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1636
        if (tree.catchers.isEmpty() && tree.finalizer == null)
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1637
            result = translate(twrBlock);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1638
        else
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1639
            result = translate(make.Try(twrBlock, tree.catchers, tree.finalizer));
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1640
        twrVars = twrVars.leave();
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1641
        return result;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1642
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1643
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1644
    private JCBlock makeTwrBlock(List<JCTree> resources, JCBlock block,
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1645
            boolean finallyCanCompleteNormally, int depth) {
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1646
        if (resources.isEmpty())
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1647
            return block;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1648
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1649
        // Add resource declaration or expression to block statements
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1650
        ListBuffer<JCStatement> stats = new ListBuffer<JCStatement>();
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1651
        JCTree resource = resources.head;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1652
        JCExpression expr = null;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1653
        if (resource instanceof JCVariableDecl) {
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1654
            JCVariableDecl var = (JCVariableDecl) resource;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1655
            expr = make.Ident(var.sym).setType(resource.type);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1656
            stats.add(var);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1657
        } else {
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1658
            Assert.check(resource instanceof JCExpression);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1659
            VarSymbol syntheticTwrVar =
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1660
            new VarSymbol(SYNTHETIC | FINAL,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1661
                          makeSyntheticName(names.fromString("twrVar" +
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1662
                                           depth), twrVars),
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
  1663
                          (resource.type.hasTag(BOT)) ?
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1664
                          syms.autoCloseableType : resource.type,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1665
                          currentMethodSym);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1666
            twrVars.enter(syntheticTwrVar);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1667
            JCVariableDecl syntheticTwrVarDecl =
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1668
                make.VarDef(syntheticTwrVar, (JCExpression)resource);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1669
            expr = (JCExpression)make.Ident(syntheticTwrVar);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1670
            stats.add(syntheticTwrVarDecl);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1671
        }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1672
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1673
        // Add primaryException declaration
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1674
        VarSymbol primaryException =
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1675
            new VarSymbol(SYNTHETIC,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1676
                          makeSyntheticName(names.fromString("primaryException" +
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1677
                          depth), twrVars),
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1678
                          syms.throwableType,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1679
                          currentMethodSym);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1680
        twrVars.enter(primaryException);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1681
        JCVariableDecl primaryExceptionTreeDecl = make.VarDef(primaryException, makeNull());
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1682
        stats.add(primaryExceptionTreeDecl);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1683
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1684
        // Create catch clause that saves exception and then rethrows it
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1685
        VarSymbol param =
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1686
            new VarSymbol(FINAL|SYNTHETIC,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1687
                          names.fromString("t" +
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1688
                                           target.syntheticNameChar()),
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1689
                          syms.throwableType,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1690
                          currentMethodSym);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1691
        JCVariableDecl paramTree = make.VarDef(param, null);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1692
        JCStatement assign = make.Assignment(primaryException, make.Ident(param));
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1693
        JCStatement rethrowStat = make.Throw(make.Ident(param));
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1694
        JCBlock catchBlock = make.Block(0L, List.<JCStatement>of(assign, rethrowStat));
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1695
        JCCatch catchClause = make.Catch(paramTree, catchBlock);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1696
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1697
        int oldPos = make.pos;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1698
        make.at(TreeInfo.endPos(block));
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1699
        JCBlock finallyClause = makeTwrFinallyClause(primaryException, expr);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1700
        make.at(oldPos);
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1701
        JCTry outerTry = make.Try(makeTwrBlock(resources.tail, block,
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1702
                                    finallyCanCompleteNormally, depth + 1),
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1703
                                  List.<JCCatch>of(catchClause),
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1704
                                  finallyClause);
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1705
        outerTry.finallyCanCompleteNormally = finallyCanCompleteNormally;
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1706
        stats.add(outerTry);
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1707
        JCBlock newBlock = make.Block(0L, stats.toList());
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1708
        return newBlock;
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1709
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1710
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1711
    private JCBlock makeTwrFinallyClause(Symbol primaryException, JCExpression resource) {
7213
912fdd70fd2a 6991528: Support making Throwable.suppressedExceptions immutable
darcy
parents: 6721
diff changeset
  1712
        // primaryException.addSuppressed(catchException);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1713
        VarSymbol catchException =
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1714
            new VarSymbol(SYNTHETIC, make.paramName(2),
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1715
                          syms.throwableType,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1716
                          currentMethodSym);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1717
        JCStatement addSuppressionStatement =
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1718
            make.Exec(makeCall(make.Ident(primaryException),
7213
912fdd70fd2a 6991528: Support making Throwable.suppressedExceptions immutable
darcy
parents: 6721
diff changeset
  1719
                               names.addSuppressed,
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1720
                               List.<JCExpression>of(make.Ident(catchException))));
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1721
7213
912fdd70fd2a 6991528: Support making Throwable.suppressedExceptions immutable
darcy
parents: 6721
diff changeset
  1722
        // try { resource.close(); } catch (e) { primaryException.addSuppressed(e); }
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1723
        JCBlock tryBlock =
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1724
            make.Block(0L, List.<JCStatement>of(makeResourceCloseInvocation(resource)));
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1725
        JCVariableDecl catchExceptionDecl = make.VarDef(catchException, null);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1726
        JCBlock catchBlock = make.Block(0L, List.<JCStatement>of(addSuppressionStatement));
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1727
        List<JCCatch> catchClauses = List.<JCCatch>of(make.Catch(catchExceptionDecl, catchBlock));
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1728
        JCTry tryTree = make.Try(tryBlock, catchClauses, null);
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  1729
        tryTree.finallyCanCompleteNormally = true;
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1730
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1731
        // if (primaryException != null) {try...} else resourceClose;
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1732
        JCIf closeIfStatement = make.If(makeNonNullCheck(make.Ident(primaryException)),
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1733
                                        tryTree,
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1734
                                        makeResourceCloseInvocation(resource));
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1735
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1736
        // if (#resource != null) { if (primaryException ...  }
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1737
        return make.Block(0L,
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1738
                          List.<JCStatement>of(make.If(makeNonNullCheck(resource),
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1739
                                                       closeIfStatement,
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1740
                                                       null)));
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1741
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1742
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1743
    private JCStatement makeResourceCloseInvocation(JCExpression resource) {
12716
5a41387068a8 7166990: java/compiler Inherited interfaces using generics sometimes looses the generic type
sundar
parents: 11314
diff changeset
  1744
        // convert to AutoCloseable if needed
5a41387068a8 7166990: java/compiler Inherited interfaces using generics sometimes looses the generic type
sundar
parents: 11314
diff changeset
  1745
        if (types.asSuper(resource.type, syms.autoCloseableType.tsym) == null) {
5a41387068a8 7166990: java/compiler Inherited interfaces using generics sometimes looses the generic type
sundar
parents: 11314
diff changeset
  1746
            resource = (JCExpression) convert(resource, syms.autoCloseableType);
5a41387068a8 7166990: java/compiler Inherited interfaces using generics sometimes looses the generic type
sundar
parents: 11314
diff changeset
  1747
        }
5a41387068a8 7166990: java/compiler Inherited interfaces using generics sometimes looses the generic type
sundar
parents: 11314
diff changeset
  1748
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1749
        // create resource.close() method invocation
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1750
        JCExpression resourceClose = makeCall(resource,
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1751
                                              names.close,
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1752
                                              List.<JCExpression>nil());
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1753
        return make.Exec(resourceClose);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1754
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  1755
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1756
    private JCExpression makeNonNullCheck(JCExpression expression) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1757
        return makeBinary(NE, expression, makeNull());
8434
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1758
    }
afb406fc66fe 7020047: Project Coin: generate null-check around try-with-resources close call
darcy
parents: 8242
diff changeset
  1759
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1760
    /** Construct a tree that represents the outer instance
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  1761
     *  {@code C.this}. Never pick the current `this'.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1762
     *  @param pos           The source code position to be used for the tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1763
     *  @param c             The qualifier class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1764
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1765
    JCExpression makeOuterThis(DiagnosticPosition pos, TypeSymbol c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1766
        List<VarSymbol> ots = outerThisStack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1767
        if (ots.isEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1768
            log.error(pos, "no.encl.instance.of.type.in.scope", c);
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1769
            Assert.error();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1770
            return makeNull();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1771
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1772
        VarSymbol ot = ots.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1773
        JCExpression tree = access(make.at(pos).Ident(ot));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1774
        TypeSymbol otc = ot.type.tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1775
        while (otc != c) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1776
            do {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1777
                ots = ots.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1778
                if (ots.isEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1779
                    log.error(pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1780
                              "no.encl.instance.of.type.in.scope",
06bc494ca11e Initial load
duke
parents:
diff changeset
  1781
                              c);
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1782
                    Assert.error(); // should have been caught in Attr
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1783
                    return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1784
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1785
                ot = ots.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1786
            } while (ot.owner != otc);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1787
            if (otc.owner.kind != PCK && !otc.hasOuterInstance()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1788
                chk.earlyRefError(pos, c);
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1789
                Assert.error(); // should have been caught in Attr
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1790
                return makeNull();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1791
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1792
            tree = access(make.at(pos).Select(tree, ot));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1793
            otc = ot.type.tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1794
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1795
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1796
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1797
06bc494ca11e Initial load
duke
parents:
diff changeset
  1798
    /** Construct a tree that represents the closest outer instance
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  1799
     *  {@code C.this} such that the given symbol is a member of C.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1800
     *  @param pos           The source code position to be used for the tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1801
     *  @param sym           The accessed symbol.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1802
     *  @param preciseMatch  should we accept a type that is a subtype of
06bc494ca11e Initial load
duke
parents:
diff changeset
  1803
     *                       sym's owner, even if it doesn't contain sym
06bc494ca11e Initial load
duke
parents:
diff changeset
  1804
     *                       due to hiding, overriding, or non-inheritance
06bc494ca11e Initial load
duke
parents:
diff changeset
  1805
     *                       due to protection?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1806
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1807
    JCExpression makeOwnerThis(DiagnosticPosition pos, Symbol sym, boolean preciseMatch) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1808
        Symbol c = sym.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1809
        if (preciseMatch ? sym.isMemberOf(currentClass, types)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1810
                         : currentClass.isSubClass(sym.owner, types)) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1811
            // in this case, `this' works fine
06bc494ca11e Initial load
duke
parents:
diff changeset
  1812
            return make.at(pos).This(c.erasure(types));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1813
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1814
            // need to go via this$n
06bc494ca11e Initial load
duke
parents:
diff changeset
  1815
            return makeOwnerThisN(pos, sym, preciseMatch);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1816
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1817
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1818
06bc494ca11e Initial load
duke
parents:
diff changeset
  1819
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  1820
     * Similar to makeOwnerThis but will never pick "this".
06bc494ca11e Initial load
duke
parents:
diff changeset
  1821
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1822
    JCExpression makeOwnerThisN(DiagnosticPosition pos, Symbol sym, boolean preciseMatch) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1823
        Symbol c = sym.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1824
        List<VarSymbol> ots = outerThisStack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1825
        if (ots.isEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1826
            log.error(pos, "no.encl.instance.of.type.in.scope", c);
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1827
            Assert.error();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1828
            return makeNull();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1829
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1830
        VarSymbol ot = ots.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1831
        JCExpression tree = access(make.at(pos).Ident(ot));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1832
        TypeSymbol otc = ot.type.tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1833
        while (!(preciseMatch ? sym.isMemberOf(otc, types) : otc.isSubClass(sym.owner, types))) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1834
            do {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1835
                ots = ots.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1836
                if (ots.isEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1837
                    log.error(pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1838
                        "no.encl.instance.of.type.in.scope",
06bc494ca11e Initial load
duke
parents:
diff changeset
  1839
                        c);
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1840
                    Assert.error();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1841
                    return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1842
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1843
                ot = ots.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1844
            } while (ot.owner != otc);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1845
            tree = access(make.at(pos).Select(tree, ot));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1846
            otc = ot.type.tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1847
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1848
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1849
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1850
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  1851
    /** Return tree simulating the assignment {@code this.name = name}, where
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1852
     *  name is the name of a free variable.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1853
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1854
    JCStatement initField(int pos, Name name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1855
        Scope.Entry e = proxies.lookup(name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1856
        Symbol rhs = e.sym;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1857
        Assert.check(rhs.owner.kind == MTH);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1858
        Symbol lhs = e.next().sym;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1859
        Assert.check(rhs.owner.owner == lhs.owner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1860
        make.at(pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1861
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
  1862
            make.Exec(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1863
                make.Assign(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1864
                    make.Select(make.This(lhs.owner.erasure(types)), lhs),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1865
                    make.Ident(rhs)).setType(lhs.erasure(types)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1866
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1867
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  1868
    /** Return tree simulating the assignment {@code this.this$n = this$n}.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1869
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1870
    JCStatement initOuterThis(int pos) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1871
        VarSymbol rhs = outerThisStack.head;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1872
        Assert.check(rhs.owner.kind == MTH);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1873
        VarSymbol lhs = outerThisStack.tail.head;
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  1874
        Assert.check(rhs.owner.owner == lhs.owner);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1875
        make.at(pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1876
        return
06bc494ca11e Initial load
duke
parents:
diff changeset
  1877
            make.Exec(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1878
                make.Assign(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1879
                    make.Select(make.This(lhs.owner.erasure(types)), lhs),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1880
                    make.Ident(rhs)).setType(lhs.erasure(types)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1881
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1882
06bc494ca11e Initial load
duke
parents:
diff changeset
  1883
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  1884
 * Code for .class
06bc494ca11e Initial load
duke
parents:
diff changeset
  1885
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  1886
06bc494ca11e Initial load
duke
parents:
diff changeset
  1887
    /** Return the symbol of a class to contain a cache of
06bc494ca11e Initial load
duke
parents:
diff changeset
  1888
     *  compiler-generated statics such as class$ and the
06bc494ca11e Initial load
duke
parents:
diff changeset
  1889
     *  $assertionsDisabled flag.  We create an anonymous nested class
06bc494ca11e Initial load
duke
parents:
diff changeset
  1890
     *  (unless one already exists) and return its symbol.  However,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1891
     *  for backward compatibility in 1.4 and earlier we use the
06bc494ca11e Initial load
duke
parents:
diff changeset
  1892
     *  top-level class itself.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1893
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1894
    private ClassSymbol outerCacheClass() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1895
        ClassSymbol clazz = outermostClassDef.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1896
        if ((clazz.flags() & INTERFACE) == 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1897
            !target.useInnerCacheClass()) return clazz;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1898
        Scope s = clazz.members();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1899
        for (Scope.Entry e = s.elems; e != null; e = e.sibling)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1900
            if (e.sym.kind == TYP &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1901
                e.sym.name == names.empty &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1902
                (e.sym.flags() & INTERFACE) == 0) return (ClassSymbol) e.sym;
15565
040a54631aad 7199823: javac generates inner class that can't be verified
vromero
parents: 15385
diff changeset
  1903
        return makeEmptyClass(STATIC | SYNTHETIC, clazz).sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1904
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1905
06bc494ca11e Initial load
duke
parents:
diff changeset
  1906
    /** Return symbol for "class$" method. If there is no method definition
06bc494ca11e Initial load
duke
parents:
diff changeset
  1907
     *  for class$, construct one as follows:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1908
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  1909
     *    class class$(String x0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1910
     *      try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1911
     *        return Class.forName(x0);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1912
     *      } catch (ClassNotFoundException x1) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1913
     *        throw new NoClassDefFoundError(x1.getMessage());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1914
     *      }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1915
     *    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1916
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1917
    private MethodSymbol classDollarSym(DiagnosticPosition pos) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1918
        ClassSymbol outerCacheClass = outerCacheClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1919
        MethodSymbol classDollarSym =
06bc494ca11e Initial load
duke
parents:
diff changeset
  1920
            (MethodSymbol)lookupSynthetic(classDollar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1921
                                          outerCacheClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1922
        if (classDollarSym == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1923
            classDollarSym = new MethodSymbol(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1924
                STATIC | SYNTHETIC,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1925
                classDollar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1926
                new MethodType(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1927
                    List.of(syms.stringType),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1928
                    types.erasure(syms.classType),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1929
                    List.<Type>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1930
                    syms.methodClass),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1931
                outerCacheClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1932
            enterSynthetic(pos, classDollarSym, outerCacheClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1933
06bc494ca11e Initial load
duke
parents:
diff changeset
  1934
            JCMethodDecl md = make.MethodDef(classDollarSym, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1935
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1936
                md.body = classDollarSymBody(pos, md);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1937
            } catch (CompletionFailure ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1938
                md.body = make.Block(0, List.<JCStatement>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1939
                chk.completionError(pos, ex);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1940
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1941
            JCClassDecl outerCacheClassDef = classDef(outerCacheClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1942
            outerCacheClassDef.defs = outerCacheClassDef.defs.prepend(md);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1943
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1944
        return classDollarSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1945
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1946
06bc494ca11e Initial load
duke
parents:
diff changeset
  1947
    /** Generate code for class$(String name). */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1948
    JCBlock classDollarSymBody(DiagnosticPosition pos, JCMethodDecl md) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1949
        MethodSymbol classDollarSym = md.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1950
        ClassSymbol outerCacheClass = (ClassSymbol)classDollarSym.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1951
06bc494ca11e Initial load
duke
parents:
diff changeset
  1952
        JCBlock returnResult;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1953
06bc494ca11e Initial load
duke
parents:
diff changeset
  1954
        // in 1.4.2 and above, we use
06bc494ca11e Initial load
duke
parents:
diff changeset
  1955
        // Class.forName(String name, boolean init, ClassLoader loader);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1956
        // which requires we cache the current loader in cl$
06bc494ca11e Initial load
duke
parents:
diff changeset
  1957
        if (target.classLiteralsNoInit()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1958
            // clsym = "private static ClassLoader cl$"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1959
            VarSymbol clsym = new VarSymbol(STATIC|SYNTHETIC,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1960
                                            names.fromString("cl" + target.syntheticNameChar()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1961
                                            syms.classLoaderType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1962
                                            outerCacheClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1963
            enterSynthetic(pos, clsym, outerCacheClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  1964
06bc494ca11e Initial load
duke
parents:
diff changeset
  1965
            // emit "private static ClassLoader cl$;"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1966
            JCVariableDecl cldef = make.VarDef(clsym, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1967
            JCClassDecl outerCacheClassDef = classDef(outerCacheClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1968
            outerCacheClassDef.defs = outerCacheClassDef.defs.prepend(cldef);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1969
06bc494ca11e Initial load
duke
parents:
diff changeset
  1970
            // newcache := "new cache$1[0]"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1971
            JCNewArray newcache = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  1972
                NewArray(make.Type(outerCacheClass.type),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1973
                         List.<JCExpression>of(make.Literal(INT, 0).setType(syms.intType)),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1974
                         null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1975
            newcache.type = new ArrayType(types.erasure(outerCacheClass.type),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1976
                                          syms.arrayClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1977
06bc494ca11e Initial load
duke
parents:
diff changeset
  1978
            // forNameSym := java.lang.Class.forName(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1979
            //     String s,boolean init,ClassLoader loader)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1980
            Symbol forNameSym = lookupMethod(make_pos, names.forName,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1981
                                             types.erasure(syms.classType),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1982
                                             List.of(syms.stringType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1983
                                                     syms.booleanType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1984
                                                     syms.classLoaderType));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1985
            // clvalue := "(cl$ == null) ?
06bc494ca11e Initial load
duke
parents:
diff changeset
  1986
            // $newcache.getClass().getComponentType().getClassLoader() : cl$"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1987
            JCExpression clvalue =
06bc494ca11e Initial load
duke
parents:
diff changeset
  1988
                make.Conditional(
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  1989
                    makeBinary(EQ, make.Ident(clsym), makeNull()),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1990
                    make.Assign(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1991
                        make.Ident(clsym),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1992
                        makeCall(
06bc494ca11e Initial load
duke
parents:
diff changeset
  1993
                            makeCall(makeCall(newcache,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1994
                                              names.getClass,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1995
                                              List.<JCExpression>nil()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1996
                                     names.getComponentType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1997
                                     List.<JCExpression>nil()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  1998
                            names.getClassLoader,
06bc494ca11e Initial load
duke
parents:
diff changeset
  1999
                            List.<JCExpression>nil())).setType(syms.classLoaderType),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2000
                    make.Ident(clsym)).setType(syms.classLoaderType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2001
06bc494ca11e Initial load
duke
parents:
diff changeset
  2002
            // returnResult := "{ return Class.forName(param1, false, cl$); }"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2003
            List<JCExpression> args = List.of(make.Ident(md.params.head.sym),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2004
                                              makeLit(syms.booleanType, 0),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2005
                                              clvalue);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2006
            returnResult = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2007
                Block(0, List.<JCStatement>of(make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2008
                              Call(make. // return
06bc494ca11e Initial load
duke
parents:
diff changeset
  2009
                                   App(make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2010
                                       Ident(forNameSym), args))));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2011
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2012
            // forNameSym := java.lang.Class.forName(String s)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2013
            Symbol forNameSym = lookupMethod(make_pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2014
                                             names.forName,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2015
                                             types.erasure(syms.classType),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2016
                                             List.of(syms.stringType));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2017
            // returnResult := "{ return Class.forName(param1); }"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2018
            returnResult = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2019
                Block(0, List.of(make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2020
                          Call(make. // return
06bc494ca11e Initial load
duke
parents:
diff changeset
  2021
                              App(make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2022
                                  QualIdent(forNameSym),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2023
                                  List.<JCExpression>of(make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2024
                                                        Ident(md.params.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2025
                                                              head.sym))))));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2026
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2027
06bc494ca11e Initial load
duke
parents:
diff changeset
  2028
        // catchParam := ClassNotFoundException e1
06bc494ca11e Initial load
duke
parents:
diff changeset
  2029
        VarSymbol catchParam =
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  2030
            new VarSymbol(SYNTHETIC, make.paramName(1),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2031
                          syms.classNotFoundExceptionType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2032
                          classDollarSym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2033
06bc494ca11e Initial load
duke
parents:
diff changeset
  2034
        JCStatement rethrow;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2035
        if (target.hasInitCause()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2036
            // rethrow = "throw new NoClassDefFoundError().initCause(e);
17807
36cff8c58cdf 7030476: Fix conflicting use of JCTree/JCExpression
vromero
parents: 17578
diff changeset
  2037
            JCExpression throwExpr =
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2038
                makeCall(makeNewClass(syms.noClassDefFoundErrorType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2039
                                      List.<JCExpression>nil()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2040
                         names.initCause,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2041
                         List.<JCExpression>of(make.Ident(catchParam)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2042
            rethrow = make.Throw(throwExpr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2043
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2044
            // getMessageSym := ClassNotFoundException.getMessage()
06bc494ca11e Initial load
duke
parents:
diff changeset
  2045
            Symbol getMessageSym = lookupMethod(make_pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2046
                                                names.getMessage,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2047
                                                syms.classNotFoundExceptionType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2048
                                                List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2049
            // rethrow = "throw new NoClassDefFoundError(e.getMessage());"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2050
            rethrow = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2051
                Throw(makeNewClass(syms.noClassDefFoundErrorType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2052
                          List.<JCExpression>of(make.App(make.Select(make.Ident(catchParam),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2053
                                                                     getMessageSym),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2054
                                                         List.<JCExpression>nil()))));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2055
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2056
06bc494ca11e Initial load
duke
parents:
diff changeset
  2057
        // rethrowStmt := "( $rethrow )"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2058
        JCBlock rethrowStmt = make.Block(0, List.of(rethrow));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2059
06bc494ca11e Initial load
duke
parents:
diff changeset
  2060
        // catchBlock := "catch ($catchParam) $rethrowStmt"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2061
        JCCatch catchBlock = make.Catch(make.VarDef(catchParam, null),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2062
                                      rethrowStmt);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2063
06bc494ca11e Initial load
duke
parents:
diff changeset
  2064
        // tryCatch := "try $returnResult $catchBlock"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2065
        JCStatement tryCatch = make.Try(returnResult,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2066
                                        List.of(catchBlock), null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2067
06bc494ca11e Initial load
duke
parents:
diff changeset
  2068
        return make.Block(0, List.of(tryCatch));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2069
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2070
    // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  2071
        /** Create an attributed tree of the form left.name(). */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2072
        private JCMethodInvocation makeCall(JCExpression left, Name name, List<JCExpression> args) {
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  2073
            Assert.checkNonNull(left.type);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2074
            Symbol funcsym = lookupMethod(make_pos, name, left.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2075
                                          TreeInfo.types(args));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2076
            return make.App(make.Select(left, funcsym), args);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2077
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2078
06bc494ca11e Initial load
duke
parents:
diff changeset
  2079
    /** The Name Of The variable to cache T.class values.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2080
     *  @param sig      The signature of type T.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2081
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2082
    private Name cacheName(String sig) {
14263
473b1eaede64 8000310: Clean up use of StringBuffer in langtools
jjg
parents: 14259
diff changeset
  2083
        StringBuilder buf = new StringBuilder();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2084
        if (sig.startsWith("[")) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2085
            buf = buf.append("array");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2086
            while (sig.startsWith("[")) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2087
                buf = buf.append(target.syntheticNameChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2088
                sig = sig.substring(1);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2089
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2090
            if (sig.startsWith("L")) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2091
                sig = sig.substring(0, sig.length() - 1);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2092
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2093
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2094
            buf = buf.append("class" + target.syntheticNameChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2095
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2096
        buf = buf.append(sig.replace('.', target.syntheticNameChar()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2097
        return names.fromString(buf.toString());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2098
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2099
06bc494ca11e Initial load
duke
parents:
diff changeset
  2100
    /** The variable symbol that caches T.class values.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2101
     *  If none exists yet, create a definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2102
     *  @param sig      The signature of type T.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2103
     *  @param pos      The position to report diagnostics, if any.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2104
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2105
    private VarSymbol cacheSym(DiagnosticPosition pos, String sig) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2106
        ClassSymbol outerCacheClass = outerCacheClass();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2107
        Name cname = cacheName(sig);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2108
        VarSymbol cacheSym =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2109
            (VarSymbol)lookupSynthetic(cname, outerCacheClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2110
        if (cacheSym == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2111
            cacheSym = new VarSymbol(
06bc494ca11e Initial load
duke
parents:
diff changeset
  2112
                STATIC | SYNTHETIC, cname, types.erasure(syms.classType), outerCacheClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2113
            enterSynthetic(pos, cacheSym, outerCacheClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2114
06bc494ca11e Initial load
duke
parents:
diff changeset
  2115
            JCVariableDecl cacheDef = make.VarDef(cacheSym, null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2116
            JCClassDecl outerCacheClassDef = classDef(outerCacheClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2117
            outerCacheClassDef.defs = outerCacheClassDef.defs.prepend(cacheDef);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2118
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2119
        return cacheSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2120
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2121
06bc494ca11e Initial load
duke
parents:
diff changeset
  2122
    /** The tree simulating a T.class expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2123
     *  @param clazz      The tree identifying type T.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2124
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2125
    private JCExpression classOf(JCTree clazz) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2126
        return classOfType(clazz.type, clazz.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2127
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2128
06bc494ca11e Initial load
duke
parents:
diff changeset
  2129
    private JCExpression classOfType(Type type, DiagnosticPosition pos) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
  2130
        switch (type.getTag()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2131
        case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2132
        case DOUBLE: case BOOLEAN: case VOID:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2133
            // replace with <BoxedClass>.TYPE
06bc494ca11e Initial load
duke
parents:
diff changeset
  2134
            ClassSymbol c = types.boxedClass(type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2135
            Symbol typeSym =
14057
b4b0377b8dba 7177387: Add target-typing support in method context
mcimadamore
parents: 13844
diff changeset
  2136
                rs.accessBase(
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2137
                    rs.findIdentInType(attrEnv, c.type, names.TYPE, VAR),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2138
                    pos, c.type, names.TYPE, true);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2139
            if (typeSym.kind == VAR)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2140
                ((VarSymbol)typeSym).getConstValue(); // ensure initializer is evaluated
06bc494ca11e Initial load
duke
parents:
diff changeset
  2141
            return make.QualIdent(typeSym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2142
        case CLASS: case ARRAY:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2143
            if (target.hasClassLiterals()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2144
                VarSymbol sym = new VarSymbol(
06bc494ca11e Initial load
duke
parents:
diff changeset
  2145
                        STATIC | PUBLIC | FINAL, names._class,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2146
                        syms.classType, type.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2147
                return make_at(pos).Select(make.Type(type), sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2148
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2149
            // replace with <cache == null ? cache = class$(tsig) : cache>
06bc494ca11e Initial load
duke
parents:
diff changeset
  2150
            // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  2151
            //  - <tsig>  is the type signature of T,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2152
            //  - <cache> is the cache variable for tsig.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2153
            String sig =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2154
                writer.xClassName(type).toString().replace('/', '.');
06bc494ca11e Initial load
duke
parents:
diff changeset
  2155
            Symbol cs = cacheSym(pos, sig);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2156
            return make_at(pos).Conditional(
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2157
                makeBinary(EQ, make.Ident(cs), makeNull()),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2158
                make.Assign(
06bc494ca11e Initial load
duke
parents:
diff changeset
  2159
                    make.Ident(cs),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2160
                    make.App(
06bc494ca11e Initial load
duke
parents:
diff changeset
  2161
                        make.Ident(classDollarSym(pos)),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2162
                        List.<JCExpression>of(make.Literal(CLASS, sig)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2163
                                              .setType(syms.stringType))))
06bc494ca11e Initial load
duke
parents:
diff changeset
  2164
                .setType(types.erasure(syms.classType)),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2165
                make.Ident(cs)).setType(types.erasure(syms.classType));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2166
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2167
            throw new AssertionError();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2168
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2169
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2170
06bc494ca11e Initial load
duke
parents:
diff changeset
  2171
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2172
 * Code for enabling/disabling assertions.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2173
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2174
06bc494ca11e Initial load
duke
parents:
diff changeset
  2175
    // This code is not particularly robust if the user has
06bc494ca11e Initial load
duke
parents:
diff changeset
  2176
    // previously declared a member named '$assertionsDisabled'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2177
    // The same faulty idiom also appears in the translation of
06bc494ca11e Initial load
duke
parents:
diff changeset
  2178
    // class literals above.  We should report an error if a
06bc494ca11e Initial load
duke
parents:
diff changeset
  2179
    // previous declaration is not synthetic.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2180
06bc494ca11e Initial load
duke
parents:
diff changeset
  2181
    private JCExpression assertFlagTest(DiagnosticPosition pos) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2182
        // Outermost class may be either true class or an interface.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2183
        ClassSymbol outermostClass = outermostClassDef.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2184
06bc494ca11e Initial load
duke
parents:
diff changeset
  2185
        // note that this is a class, as an interface can't contain a statement.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2186
        ClassSymbol container = currentClass;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2187
06bc494ca11e Initial load
duke
parents:
diff changeset
  2188
        VarSymbol assertDisabledSym =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2189
            (VarSymbol)lookupSynthetic(dollarAssertionsDisabled,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2190
                                       container.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2191
        if (assertDisabledSym == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2192
            assertDisabledSym =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2193
                new VarSymbol(STATIC | FINAL | SYNTHETIC,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2194
                              dollarAssertionsDisabled,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2195
                              syms.booleanType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2196
                              container);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2197
            enterSynthetic(pos, assertDisabledSym, container.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2198
            Symbol desiredAssertionStatusSym = lookupMethod(pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2199
                                                            names.desiredAssertionStatus,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2200
                                                            types.erasure(syms.classType),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2201
                                                            List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2202
            JCClassDecl containerDef = classDef(container);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2203
            make_at(containerDef.pos());
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2204
            JCExpression notStatus = makeUnary(NOT, make.App(make.Select(
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2205
                    classOfType(types.erasure(outermostClass.type),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2206
                                containerDef.pos()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2207
                    desiredAssertionStatusSym)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2208
            JCVariableDecl assertDisabledDef = make.VarDef(assertDisabledSym,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2209
                                                   notStatus);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2210
            containerDef.defs = containerDef.defs.prepend(assertDisabledDef);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2211
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2212
        make_at(pos);
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2213
        return makeUnary(NOT, make.Ident(assertDisabledSym));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2214
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2215
06bc494ca11e Initial load
duke
parents:
diff changeset
  2216
06bc494ca11e Initial load
duke
parents:
diff changeset
  2217
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2218
 * Building blocks for let expressions
06bc494ca11e Initial load
duke
parents:
diff changeset
  2219
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2220
06bc494ca11e Initial load
duke
parents:
diff changeset
  2221
    interface TreeBuilder {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2222
        JCTree build(JCTree arg);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2223
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2224
06bc494ca11e Initial load
duke
parents:
diff changeset
  2225
    /** Construct an expression using the builder, with the given rval
06bc494ca11e Initial load
duke
parents:
diff changeset
  2226
     *  expression as an argument to the builder.  However, the rval
06bc494ca11e Initial load
duke
parents:
diff changeset
  2227
     *  expression must be computed only once, even if used multiple
06bc494ca11e Initial load
duke
parents:
diff changeset
  2228
     *  times in the result of the builder.  We do that by
06bc494ca11e Initial load
duke
parents:
diff changeset
  2229
     *  constructing a "let" expression that saves the rvalue into a
06bc494ca11e Initial load
duke
parents:
diff changeset
  2230
     *  temporary variable and then uses the temporary variable in
06bc494ca11e Initial load
duke
parents:
diff changeset
  2231
     *  place of the expression built by the builder.  The complete
06bc494ca11e Initial load
duke
parents:
diff changeset
  2232
     *  resulting expression is of the form
06bc494ca11e Initial load
duke
parents:
diff changeset
  2233
     *  <pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
  2234
     *    (let <b>TYPE</b> <b>TEMP</b> = <b>RVAL</b>;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2235
     *     in (<b>BUILDER</b>(<b>TEMP</b>)))
06bc494ca11e Initial load
duke
parents:
diff changeset
  2236
     *  </pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
  2237
     *  where <code><b>TEMP</b></code> is a newly declared variable
06bc494ca11e Initial load
duke
parents:
diff changeset
  2238
     *  in the let expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2239
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2240
    JCTree abstractRval(JCTree rval, Type type, TreeBuilder builder) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2241
        rval = TreeInfo.skipParens(rval);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2242
        switch (rval.getTag()) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2243
        case LITERAL:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2244
            return builder.build(rval);
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2245
        case IDENT:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2246
            JCIdent id = (JCIdent) rval;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2247
            if ((id.sym.flags() & FINAL) != 0 && id.sym.owner.kind == MTH)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2248
                return builder.build(rval);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2249
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2250
        VarSymbol var =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2251
            new VarSymbol(FINAL|SYNTHETIC,
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1037
diff changeset
  2252
                          names.fromString(
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2253
                                          target.syntheticNameChar()
06bc494ca11e Initial load
duke
parents:
diff changeset
  2254
                                          + "" + rval.hashCode()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2255
                                      type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2256
                                      currentMethodSym);
161
bfe63856332f 6614974: javac successfully compiles code that throws java.lang.VerifyError when run
mcimadamore
parents: 10
diff changeset
  2257
        rval = convert(rval,type);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2258
        JCVariableDecl def = make.VarDef(var, (JCExpression)rval); // XXX cast
06bc494ca11e Initial load
duke
parents:
diff changeset
  2259
        JCTree built = builder.build(make.Ident(var));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2260
        JCTree res = make.LetExpr(def, built);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2261
        res.type = built.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2262
        return res;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2263
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2264
06bc494ca11e Initial load
duke
parents:
diff changeset
  2265
    // same as above, with the type of the temporary variable computed
06bc494ca11e Initial load
duke
parents:
diff changeset
  2266
    JCTree abstractRval(JCTree rval, TreeBuilder builder) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2267
        return abstractRval(rval, rval.type, builder);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2268
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2269
06bc494ca11e Initial load
duke
parents:
diff changeset
  2270
    // same as above, but for an expression that may be used as either
06bc494ca11e Initial load
duke
parents:
diff changeset
  2271
    // an rvalue or an lvalue.  This requires special handling for
06bc494ca11e Initial load
duke
parents:
diff changeset
  2272
    // Select expressions, where we place the left-hand-side of the
06bc494ca11e Initial load
duke
parents:
diff changeset
  2273
    // select in a temporary, and for Indexed expressions, where we
06bc494ca11e Initial load
duke
parents:
diff changeset
  2274
    // place both the indexed expression and the index value in temps.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2275
    JCTree abstractLval(JCTree lval, final TreeBuilder builder) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2276
        lval = TreeInfo.skipParens(lval);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2277
        switch (lval.getTag()) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2278
        case IDENT:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2279
            return builder.build(lval);
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2280
        case SELECT: {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2281
            final JCFieldAccess s = (JCFieldAccess)lval;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2282
            JCTree selected = TreeInfo.skipParens(s.selected);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2283
            Symbol lid = TreeInfo.symbol(s.selected);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2284
            if (lid != null && lid.kind == TYP) return builder.build(lval);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2285
            return abstractRval(s.selected, new TreeBuilder() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2286
                    public JCTree build(final JCTree selected) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2287
                        return builder.build(make.Select((JCExpression)selected, s.sym));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2288
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2289
                });
06bc494ca11e Initial load
duke
parents:
diff changeset
  2290
        }
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2291
        case INDEXED: {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2292
            final JCArrayAccess i = (JCArrayAccess)lval;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2293
            return abstractRval(i.indexed, new TreeBuilder() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2294
                    public JCTree build(final JCTree indexed) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2295
                        return abstractRval(i.index, syms.intType, new TreeBuilder() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2296
                                public JCTree build(final JCTree index) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2297
                                    JCTree newLval = make.Indexed((JCExpression)indexed,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2298
                                                                (JCExpression)index);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2299
                                    newLval.setType(i.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2300
                                    return builder.build(newLval);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2301
                                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2302
                            });
06bc494ca11e Initial load
duke
parents:
diff changeset
  2303
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2304
                });
06bc494ca11e Initial load
duke
parents:
diff changeset
  2305
        }
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2306
        case TYPECAST: {
1468
19d266637353 6751514: Unary post-increment with type variables crash javac during lowering
mcimadamore
parents: 1260
diff changeset
  2307
            return abstractLval(((JCTypeCast)lval).expr, builder);
19d266637353 6751514: Unary post-increment with type variables crash javac during lowering
mcimadamore
parents: 1260
diff changeset
  2308
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2309
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2310
        throw new AssertionError(lval);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2311
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2312
06bc494ca11e Initial load
duke
parents:
diff changeset
  2313
    // evaluate and discard the first expression, then evaluate the second.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2314
    JCTree makeComma(final JCTree expr1, final JCTree expr2) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2315
        return abstractRval(expr1, new TreeBuilder() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2316
                public JCTree build(final JCTree discarded) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2317
                    return expr2;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2318
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2319
            });
06bc494ca11e Initial load
duke
parents:
diff changeset
  2320
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2321
06bc494ca11e Initial load
duke
parents:
diff changeset
  2322
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  2323
 * Translation methods
06bc494ca11e Initial load
duke
parents:
diff changeset
  2324
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  2325
06bc494ca11e Initial load
duke
parents:
diff changeset
  2326
    /** Visitor argument: enclosing operator node.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2327
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2328
    private JCExpression enclOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2329
06bc494ca11e Initial load
duke
parents:
diff changeset
  2330
    /** Visitor method: Translate a single node.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2331
     *  Attach the source position from the old tree to its replacement tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2332
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2333
    public <T extends JCTree> T translate(T tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2334
        if (tree == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2335
            return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2336
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2337
            make_at(tree.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2338
            T result = super.translate(tree);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  2339
            if (endPosTable != null && result != tree) {
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  2340
                endPosTable.replaceTree(tree, result);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2341
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2342
            return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2343
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2344
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2345
06bc494ca11e Initial load
duke
parents:
diff changeset
  2346
    /** Visitor method: Translate a single node, boxing or unboxing if needed.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2347
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2348
    public <T extends JCTree> T translate(T tree, Type type) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2349
        return (tree == null) ? null : boxIfNeeded(translate(tree), type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2350
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2351
06bc494ca11e Initial load
duke
parents:
diff changeset
  2352
    /** Visitor method: Translate tree.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2353
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2354
    public <T extends JCTree> T translate(T tree, JCExpression enclOp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2355
        JCExpression prevEnclOp = this.enclOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2356
        this.enclOp = enclOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2357
        T res = translate(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2358
        this.enclOp = prevEnclOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2359
        return res;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2360
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2361
06bc494ca11e Initial load
duke
parents:
diff changeset
  2362
    /** Visitor method: Translate list of trees.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2363
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2364
    public <T extends JCTree> List<T> translate(List<T> trees, JCExpression enclOp) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2365
        JCExpression prevEnclOp = this.enclOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2366
        this.enclOp = enclOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2367
        List<T> res = translate(trees);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2368
        this.enclOp = prevEnclOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2369
        return res;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2370
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2371
06bc494ca11e Initial load
duke
parents:
diff changeset
  2372
    /** Visitor method: Translate list of trees.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2373
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2374
    public <T extends JCTree> List<T> translate(List<T> trees, Type type) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2375
        if (trees == null) return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2376
        for (List<T> l = trees; l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2377
            l.head = translate(l.head, type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2378
        return trees;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2379
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2380
06bc494ca11e Initial load
duke
parents:
diff changeset
  2381
    public void visitTopLevel(JCCompilationUnit tree) {
6575
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2382
        if (needPackageInfoClass(tree)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2383
            Name name = names.package_info;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2384
            long flags = Flags.ABSTRACT | Flags.INTERFACE;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2385
            if (target.isPackageInfoSynthetic())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2386
                // package-info is marked SYNTHETIC in JDK 1.6 and later releases
06bc494ca11e Initial load
duke
parents:
diff changeset
  2387
                flags = flags | Flags.SYNTHETIC;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2388
            JCClassDecl packageAnnotationsClass
06bc494ca11e Initial load
duke
parents:
diff changeset
  2389
                = make.ClassDef(make.Modifiers(flags,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2390
                                               tree.packageAnnotations),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2391
                                name, List.<JCTypeParameter>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2392
                                null, List.<JCExpression>nil(), List.<JCTree>nil());
4871
655bba719625 6499119: Created package-info class file modeled improperly
jjg
parents: 4417
diff changeset
  2393
            ClassSymbol c = tree.packge.package_info;
655bba719625 6499119: Created package-info class file modeled improperly
jjg
parents: 4417
diff changeset
  2394
            c.flags_field |= flags;
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17808
diff changeset
  2395
            c.setAttributes(tree.packge);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2396
            ClassType ctype = (ClassType) c.type;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2397
            ctype.supertype_field = syms.objectType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2398
            ctype.interfaces_field = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2399
            packageAnnotationsClass.sym = c;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2400
06bc494ca11e Initial load
duke
parents:
diff changeset
  2401
            translated.append(packageAnnotationsClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2402
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2403
    }
6575
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2404
    // where
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2405
    private boolean needPackageInfoClass(JCCompilationUnit tree) {
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2406
        switch (pkginfoOpt) {
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2407
            case ALWAYS:
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2408
                return true;
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2409
            case LEGACY:
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2410
                return tree.packageAnnotations.nonEmpty();
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2411
            case NONEMPTY:
13689
4d519199a6aa 7151010: Add compiler support for repeating annotations
jfranck
parents: 13633
diff changeset
  2412
                for (Attribute.Compound a :
18010
604faee85350 8004643: Reduce javac space overhead introduced with compiler support for repeating annotations
jjg
parents: 17808
diff changeset
  2413
                         tree.packge.getDeclarationAttributes()) {
6575
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2414
                    Attribute.RetentionPolicy p = types.getRetention(a);
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2415
                    if (p != Attribute.RetentionPolicy.SOURCE)
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2416
                        return true;
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2417
                }
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2418
                return false;
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2419
        }
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2420
        throw new AssertionError();
ae1798028008 6960424: new option -Xpkginfo for better control of when package-info.class is generated
jjg
parents: 6148
diff changeset
  2421
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2422
06bc494ca11e Initial load
duke
parents:
diff changeset
  2423
    public void visitClassDef(JCClassDecl tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2424
        ClassSymbol currentClassPrev = currentClass;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2425
        MethodSymbol currentMethodSymPrev = currentMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2426
        currentClass = tree.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2427
        currentMethodSym = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2428
        classdefs.put(currentClass, tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2429
06bc494ca11e Initial load
duke
parents:
diff changeset
  2430
        proxies = proxies.dup(currentClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2431
        List<VarSymbol> prevOuterThisStack = outerThisStack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2432
06bc494ca11e Initial load
duke
parents:
diff changeset
  2433
        // If this is an enum definition
06bc494ca11e Initial load
duke
parents:
diff changeset
  2434
        if ((tree.mods.flags & ENUM) != 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2435
            (types.supertype(currentClass.type).tsym.flags() & ENUM) == 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2436
            visitEnumDef(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2437
06bc494ca11e Initial load
duke
parents:
diff changeset
  2438
        // If this is a nested class, define a this$n field for
06bc494ca11e Initial load
duke
parents:
diff changeset
  2439
        // it and add to proxies.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2440
        JCVariableDecl otdef = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2441
        if (currentClass.hasOuterInstance())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2442
            otdef = outerThisDef(tree.pos, currentClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2443
06bc494ca11e Initial load
duke
parents:
diff changeset
  2444
        // If this is a local class, define proxies for all its free variables.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2445
        List<JCVariableDecl> fvdefs = freevarDefs(
06bc494ca11e Initial load
duke
parents:
diff changeset
  2446
            tree.pos, freevars(currentClass), currentClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2447
06bc494ca11e Initial load
duke
parents:
diff changeset
  2448
        // Recursively translate superclass, interfaces.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2449
        tree.extending = translate(tree.extending);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2450
        tree.implementing = translate(tree.implementing);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2451
10627
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2452
        if (currentClass.isLocal()) {
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2453
            ClassSymbol encl = currentClass.owner.enclClass();
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2454
            if (encl.trans_local == null) {
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2455
                encl.trans_local = List.nil();
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2456
            }
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2457
            encl.trans_local = encl.trans_local.prepend(currentClass);
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2458
        }
d8e900b62e02 7003595: IncompatibleClassChangeError with unreferenced local class with subclass
mcimadamore
parents: 10201
diff changeset
  2459
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2460
        // Recursively translate members, taking into account that new members
06bc494ca11e Initial load
duke
parents:
diff changeset
  2461
        // might be created during the translation and prepended to the member
06bc494ca11e Initial load
duke
parents:
diff changeset
  2462
        // list `tree.defs'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2463
        List<JCTree> seen = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2464
        while (tree.defs != seen) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2465
            List<JCTree> unseen = tree.defs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2466
            for (List<JCTree> l = unseen; l.nonEmpty() && l != seen; l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2467
                JCTree outermostMemberDefPrev = outermostMemberDef;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2468
                if (outermostMemberDefPrev == null) outermostMemberDef = l.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2469
                l.head = translate(l.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2470
                outermostMemberDef = outermostMemberDefPrev;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2471
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2472
            seen = unseen;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2473
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2474
06bc494ca11e Initial load
duke
parents:
diff changeset
  2475
        // Convert a protected modifier to public, mask static modifier.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2476
        if ((tree.mods.flags & PROTECTED) != 0) tree.mods.flags |= PUBLIC;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2477
        tree.mods.flags &= ClassFlags;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2478
06bc494ca11e Initial load
duke
parents:
diff changeset
  2479
        // Convert name to flat representation, replacing '.' by '$'.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2480
        tree.name = Convert.shortName(currentClass.flatName());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2481
06bc494ca11e Initial load
duke
parents:
diff changeset
  2482
        // Add this$n and free variables proxy definitions to class.
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
  2483
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2484
        for (List<JCVariableDecl> l = fvdefs; l.nonEmpty(); l = l.tail) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2485
            tree.defs = tree.defs.prepend(l.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2486
            enterSynthetic(tree.pos(), l.head.sym, currentClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2487
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2488
        if (currentClass.hasOuterInstance()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2489
            tree.defs = tree.defs.prepend(otdef);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2490
            enterSynthetic(tree.pos(), otdef.sym, currentClass.members());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2491
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2492
06bc494ca11e Initial load
duke
parents:
diff changeset
  2493
        proxies = proxies.leave();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2494
        outerThisStack = prevOuterThisStack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2495
06bc494ca11e Initial load
duke
parents:
diff changeset
  2496
        // Append translated tree to `translated' queue.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2497
        translated.append(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2498
06bc494ca11e Initial load
duke
parents:
diff changeset
  2499
        currentClass = currentClassPrev;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2500
        currentMethodSym = currentMethodSymPrev;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2501
06bc494ca11e Initial load
duke
parents:
diff changeset
  2502
        // Return empty block {} as a placeholder for an inner class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2503
        result = make_at(tree.pos()).Block(0, List.<JCStatement>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2504
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2505
06bc494ca11e Initial load
duke
parents:
diff changeset
  2506
    /** Translate an enum class. */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2507
    private void visitEnumDef(JCClassDecl tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2508
        make_at(tree.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2509
06bc494ca11e Initial load
duke
parents:
diff changeset
  2510
        // add the supertype, if needed
06bc494ca11e Initial load
duke
parents:
diff changeset
  2511
        if (tree.extending == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2512
            tree.extending = make.Type(types.supertype(tree.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2513
06bc494ca11e Initial load
duke
parents:
diff changeset
  2514
        // classOfType adds a cache field to tree.defs unless
06bc494ca11e Initial load
duke
parents:
diff changeset
  2515
        // target.hasClassLiterals().
06bc494ca11e Initial load
duke
parents:
diff changeset
  2516
        JCExpression e_class = classOfType(tree.sym.type, tree.pos()).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2517
            setType(types.erasure(syms.classType));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2518
06bc494ca11e Initial load
duke
parents:
diff changeset
  2519
        // process each enumeration constant, adding implicit constructor parameters
06bc494ca11e Initial load
duke
parents:
diff changeset
  2520
        int nextOrdinal = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2521
        ListBuffer<JCExpression> values = new ListBuffer<JCExpression>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2522
        ListBuffer<JCTree> enumDefs = new ListBuffer<JCTree>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2523
        ListBuffer<JCTree> otherDefs = new ListBuffer<JCTree>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2524
        for (List<JCTree> defs = tree.defs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2525
             defs.nonEmpty();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2526
             defs=defs.tail) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2527
            if (defs.head.hasTag(VARDEF) && (((JCVariableDecl) defs.head).mods.flags & ENUM) != 0) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2528
                JCVariableDecl var = (JCVariableDecl)defs.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2529
                visitEnumConstantDef(var, nextOrdinal++);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2530
                values.append(make.QualIdent(var.sym));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2531
                enumDefs.append(var);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2532
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2533
                otherDefs.append(defs.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2534
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2535
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2536
06bc494ca11e Initial load
duke
parents:
diff changeset
  2537
        // private static final T[] #VALUES = { a, b, c };
06bc494ca11e Initial load
duke
parents:
diff changeset
  2538
        Name valuesName = names.fromString(target.syntheticNameChar() + "VALUES");
06bc494ca11e Initial load
duke
parents:
diff changeset
  2539
        while (tree.sym.members().lookup(valuesName).scope != null) // avoid name clash
06bc494ca11e Initial load
duke
parents:
diff changeset
  2540
            valuesName = names.fromString(valuesName + "" + target.syntheticNameChar());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2541
        Type arrayType = new ArrayType(types.erasure(tree.type), syms.arrayClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2542
        VarSymbol valuesVar = new VarSymbol(PRIVATE|FINAL|STATIC|SYNTHETIC,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2543
                                            valuesName,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2544
                                            arrayType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2545
                                            tree.type.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2546
        JCNewArray newArray = make.NewArray(make.Type(types.erasure(tree.type)),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2547
                                          List.<JCExpression>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2548
                                          values.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2549
        newArray.type = arrayType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2550
        enumDefs.append(make.VarDef(valuesVar, newArray));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2551
        tree.sym.members().enter(valuesVar);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2552
06bc494ca11e Initial load
duke
parents:
diff changeset
  2553
        Symbol valuesSym = lookupMethod(tree.pos(), names.values,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2554
                                        tree.type, List.<Type>nil());
1037
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2555
        List<JCStatement> valuesBody;
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2556
        if (useClone()) {
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2557
            // return (T[]) $VALUES.clone();
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2558
            JCTypeCast valuesResult =
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2559
                make.TypeCast(valuesSym.type.getReturnType(),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2560
                              make.App(make.Select(make.Ident(valuesVar),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2561
                                                   syms.arrayCloneMethod)));
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2562
            valuesBody = List.<JCStatement>of(make.Return(valuesResult));
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2563
        } else {
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2564
            // template: T[] $result = new T[$values.length];
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2565
            Name resultName = names.fromString(target.syntheticNameChar() + "result");
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2566
            while (tree.sym.members().lookup(resultName).scope != null) // avoid name clash
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2567
                resultName = names.fromString(resultName + "" + target.syntheticNameChar());
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2568
            VarSymbol resultVar = new VarSymbol(FINAL|SYNTHETIC,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2569
                                                resultName,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2570
                                                arrayType,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2571
                                                valuesSym);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2572
            JCNewArray resultArray = make.NewArray(make.Type(types.erasure(tree.type)),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2573
                                  List.of(make.Select(make.Ident(valuesVar), syms.lengthVar)),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2574
                                  null);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2575
            resultArray.type = arrayType;
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2576
            JCVariableDecl decl = make.VarDef(resultVar, resultArray);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2577
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2578
            // template: System.arraycopy($VALUES, 0, $result, 0, $VALUES.length);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2579
            if (systemArraycopyMethod == null) {
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2580
                systemArraycopyMethod =
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2581
                    new MethodSymbol(PUBLIC | STATIC,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2582
                                     names.fromString("arraycopy"),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2583
                                     new MethodType(List.<Type>of(syms.objectType,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2584
                                                            syms.intType,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2585
                                                            syms.objectType,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2586
                                                            syms.intType,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2587
                                                            syms.intType),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2588
                                                    syms.voidType,
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2589
                                                    List.<Type>nil(),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2590
                                                    syms.methodClass),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2591
                                     syms.systemType.tsym);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2592
            }
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2593
            JCStatement copy =
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2594
                make.Exec(make.App(make.Select(make.Ident(syms.systemType.tsym),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2595
                                               systemArraycopyMethod),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2596
                          List.of(make.Ident(valuesVar), make.Literal(0),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2597
                                  make.Ident(resultVar), make.Literal(0),
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2598
                                  make.Select(make.Ident(valuesVar), syms.lengthVar))));
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2599
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2600
            // template: return $result;
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2601
            JCStatement ret = make.Return(make.Ident(resultVar));
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2602
            valuesBody = List.<JCStatement>of(decl, copy, ret);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2603
        }
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2604
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2605
        JCMethodDecl valuesDef =
1037
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2606
             make.MethodDef((MethodSymbol)valuesSym, make.Block(0, valuesBody));
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2607
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2608
        enumDefs.append(valuesDef);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2609
1037
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2610
        if (debugLower)
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2611
            System.err.println(tree.sym + ".valuesDef = " + valuesDef);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2612
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2613
        /** The template for the following code is:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2614
         *
06bc494ca11e Initial load
duke
parents:
diff changeset
  2615
         *     public static E valueOf(String name) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2616
         *         return (E)Enum.valueOf(E.class, name);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2617
         *     }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2618
         *
06bc494ca11e Initial load
duke
parents:
diff changeset
  2619
         *  where E is tree.sym
06bc494ca11e Initial load
duke
parents:
diff changeset
  2620
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2621
        MethodSymbol valueOfSym = lookupMethod(tree.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2622
                         names.valueOf,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2623
                         tree.sym.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2624
                         List.of(syms.stringType));
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  2625
        Assert.check((valueOfSym.flags() & STATIC) != 0);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2626
        VarSymbol nameArgSym = valueOfSym.params.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2627
        JCIdent nameVal = make.Ident(nameArgSym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2628
        JCStatement enum_ValueOf =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2629
            make.Return(make.TypeCast(tree.sym.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2630
                                      makeCall(make.Ident(syms.enumSym),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2631
                                               names.valueOf,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2632
                                               List.of(e_class, nameVal))));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2633
        JCMethodDecl valueOf = make.MethodDef(valueOfSym,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2634
                                           make.Block(0, List.of(enum_ValueOf)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2635
        nameVal.sym = valueOf.params.head.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2636
        if (debugLower)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2637
            System.err.println(tree.sym + ".valueOf = " + valueOf);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2638
        enumDefs.append(valueOf);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2639
06bc494ca11e Initial load
duke
parents:
diff changeset
  2640
        enumDefs.appendList(otherDefs.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2641
        tree.defs = enumDefs.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2642
    }
1037
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2643
        // where
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2644
        private MethodSymbol systemArraycopyMethod;
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2645
        private boolean useClone() {
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2646
            try {
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2647
                Scope.Entry e = syms.objectType.tsym.members().lookup(names.clone);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2648
                return (e.sym != null);
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2649
            }
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2650
            catch (CompletionFailure e) {
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2651
                return false;
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2652
            }
c6b315a34dc6 6627362: javac generates code that uses array.clone, which is not available on JavaCard
jjg
parents: 940
diff changeset
  2653
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2654
06bc494ca11e Initial load
duke
parents:
diff changeset
  2655
    /** Translate an enumeration constant and its initializer. */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2656
    private void visitEnumConstantDef(JCVariableDecl var, int ordinal) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2657
        JCNewClass varDef = (JCNewClass)var.init;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2658
        varDef.args = varDef.args.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2659
            prepend(makeLit(syms.intType, ordinal)).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2660
            prepend(makeLit(syms.stringType, var.name.toString()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2661
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2662
06bc494ca11e Initial load
duke
parents:
diff changeset
  2663
    public void visitMethodDef(JCMethodDecl tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2664
        if (tree.name == names.init && (currentClass.flags_field&ENUM) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2665
            // Add "String $enum$name, int $enum$ordinal" to the beginning of the
06bc494ca11e Initial load
duke
parents:
diff changeset
  2666
            // argument list for each constructor of an enum.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2667
            JCVariableDecl nameParam = make_at(tree.pos()).
06bc494ca11e Initial load
duke
parents:
diff changeset
  2668
                Param(names.fromString(target.syntheticNameChar() +
06bc494ca11e Initial load
duke
parents:
diff changeset
  2669
                                       "enum" + target.syntheticNameChar() + "name"),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2670
                      syms.stringType, tree.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2671
            nameParam.mods.flags |= SYNTHETIC; nameParam.sym.flags_field |= SYNTHETIC;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2672
            JCVariableDecl ordParam = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2673
                Param(names.fromString(target.syntheticNameChar() +
06bc494ca11e Initial load
duke
parents:
diff changeset
  2674
                                       "enum" + target.syntheticNameChar() +
06bc494ca11e Initial load
duke
parents:
diff changeset
  2675
                                       "ordinal"),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2676
                      syms.intType, tree.sym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2677
            ordParam.mods.flags |= SYNTHETIC; ordParam.sym.flags_field |= SYNTHETIC;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2678
06bc494ca11e Initial load
duke
parents:
diff changeset
  2679
            tree.params = tree.params.prepend(ordParam).prepend(nameParam);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2680
06bc494ca11e Initial load
duke
parents:
diff changeset
  2681
            MethodSymbol m = tree.sym;
15720
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  2682
            m.extraParams = m.extraParams.prepend(ordParam.sym);
e61b2f7a5148 8006345: Report Synthesized Parameters in java.lang.reflect.Parameter API
mcimadamore
parents: 15712
diff changeset
  2683
            m.extraParams = m.extraParams.prepend(nameParam.sym);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2684
            Type olderasure = m.erasure(types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2685
            m.erasure_field = new MethodType(
06bc494ca11e Initial load
duke
parents:
diff changeset
  2686
                olderasure.getParameterTypes().prepend(syms.intType).prepend(syms.stringType),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2687
                olderasure.getReturnType(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2688
                olderasure.getThrownTypes(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2689
                syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2690
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2691
06bc494ca11e Initial load
duke
parents:
diff changeset
  2692
        JCMethodDecl prevMethodDef = currentMethodDef;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2693
        MethodSymbol prevMethodSym = currentMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2694
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2695
            currentMethodDef = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2696
            currentMethodSym = tree.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2697
            visitMethodDefInternal(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2698
        } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2699
            currentMethodDef = prevMethodDef;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2700
            currentMethodSym = prevMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2701
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2702
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2703
    //where
06bc494ca11e Initial load
duke
parents:
diff changeset
  2704
    private void visitMethodDefInternal(JCMethodDecl tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2705
        if (tree.name == names.init &&
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
  2706
            (currentClass.isInner() || currentClass.isLocal())) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2707
            // We are seeing a constructor of an inner class.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2708
            MethodSymbol m = tree.sym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2709
06bc494ca11e Initial load
duke
parents:
diff changeset
  2710
            // Push a new proxy scope for constructor parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2711
            // and create definitions for any this$n and proxy parameters.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2712
            proxies = proxies.dup(m);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2713
            List<VarSymbol> prevOuterThisStack = outerThisStack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2714
            List<VarSymbol> fvs = freevars(currentClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2715
            JCVariableDecl otdef = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2716
            if (currentClass.hasOuterInstance())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2717
                otdef = outerThisDef(tree.pos, m);
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  2718
            List<JCVariableDecl> fvdefs = freevarDefs(tree.pos, fvs, m, PARAMETER);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2719
06bc494ca11e Initial load
duke
parents:
diff changeset
  2720
            // Recursively translate result type, parameters and thrown list.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2721
            tree.restype = translate(tree.restype);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2722
            tree.params = translateVarDefs(tree.params);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2723
            tree.thrown = translate(tree.thrown);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2724
06bc494ca11e Initial load
duke
parents:
diff changeset
  2725
            // when compiling stubs, don't process body
06bc494ca11e Initial load
duke
parents:
diff changeset
  2726
            if (tree.body == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2727
                result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2728
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2729
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2730
06bc494ca11e Initial load
duke
parents:
diff changeset
  2731
            // Add this$n (if needed) in front of and free variables behind
06bc494ca11e Initial load
duke
parents:
diff changeset
  2732
            // constructor parameter list.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2733
            tree.params = tree.params.appendList(fvdefs);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2734
            if (currentClass.hasOuterInstance())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2735
                tree.params = tree.params.prepend(otdef);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2736
06bc494ca11e Initial load
duke
parents:
diff changeset
  2737
            // If this is an initial constructor, i.e., it does not start with
06bc494ca11e Initial load
duke
parents:
diff changeset
  2738
            // this(...), insert initializers for this$n and proxies
06bc494ca11e Initial load
duke
parents:
diff changeset
  2739
            // before (pre-1.4, after) the call to superclass constructor.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2740
            JCStatement selfCall = translate(tree.body.stats.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2741
06bc494ca11e Initial load
duke
parents:
diff changeset
  2742
            List<JCStatement> added = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2743
            if (fvs.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2744
                List<Type> addedargtypes = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2745
                for (List<VarSymbol> l = fvs; l.nonEmpty(); l = l.tail) {
18377
3f5b364f9d22 8015701: MethodParameters are not filled in for synthetic captured local variables
emc
parents: 18010
diff changeset
  2746
                    if (TreeInfo.isInitialConstructor(tree)) {
3f5b364f9d22 8015701: MethodParameters are not filled in for synthetic captured local variables
emc
parents: 18010
diff changeset
  2747
                        final Name pName = proxyName(l.head.name);
19657
48226ff07b84 8020745: Suspicious MethodParameters attribute generated for local classes capturing local variables
emc
parents: 19501
diff changeset
  2748
                        m.capturedLocals =
48226ff07b84 8020745: Suspicious MethodParameters attribute generated for local classes capturing local variables
emc
parents: 19501
diff changeset
  2749
                            m.capturedLocals.append((VarSymbol)
48226ff07b84 8020745: Suspicious MethodParameters attribute generated for local classes capturing local variables
emc
parents: 19501
diff changeset
  2750
                                                    (proxies.lookup(pName).sym));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2751
                        added = added.prepend(
18377
3f5b364f9d22 8015701: MethodParameters are not filled in for synthetic captured local variables
emc
parents: 18010
diff changeset
  2752
                          initField(tree.body.pos, pName));
3f5b364f9d22 8015701: MethodParameters are not filled in for synthetic captured local variables
emc
parents: 18010
diff changeset
  2753
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2754
                    addedargtypes = addedargtypes.prepend(l.head.erasure(types));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2755
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2756
                Type olderasure = m.erasure(types);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2757
                m.erasure_field = new MethodType(
06bc494ca11e Initial load
duke
parents:
diff changeset
  2758
                    olderasure.getParameterTypes().appendList(addedargtypes),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2759
                    olderasure.getReturnType(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2760
                    olderasure.getThrownTypes(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2761
                    syms.methodClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2762
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2763
            if (currentClass.hasOuterInstance() &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2764
                TreeInfo.isInitialConstructor(tree))
06bc494ca11e Initial load
duke
parents:
diff changeset
  2765
            {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2766
                added = added.prepend(initOuterThis(tree.body.pos));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2767
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2768
06bc494ca11e Initial load
duke
parents:
diff changeset
  2769
            // pop local variables from proxy stack
06bc494ca11e Initial load
duke
parents:
diff changeset
  2770
            proxies = proxies.leave();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2771
06bc494ca11e Initial load
duke
parents:
diff changeset
  2772
            // recursively translate following local statements and
06bc494ca11e Initial load
duke
parents:
diff changeset
  2773
            // combine with this- or super-call
06bc494ca11e Initial load
duke
parents:
diff changeset
  2774
            List<JCStatement> stats = translate(tree.body.stats.tail);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2775
            if (target.initializeFieldsBeforeSuper())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2776
                tree.body.stats = stats.prepend(selfCall).prependList(added);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2777
            else
06bc494ca11e Initial load
duke
parents:
diff changeset
  2778
                tree.body.stats = stats.prependList(added).prepend(selfCall);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2779
06bc494ca11e Initial load
duke
parents:
diff changeset
  2780
            outerThisStack = prevOuterThisStack;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2781
        } else {
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2782
            Map<Symbol, Symbol> prevLambdaTranslationMap =
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2783
                    lambdaTranslationMap;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2784
            try {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2785
                lambdaTranslationMap = (tree.sym.flags() & SYNTHETIC) != 0 &&
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2786
                        tree.sym.name.startsWith(names.lambda) ?
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2787
                        makeTranslationMap(tree) : null;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2788
                super.visitMethodDef(tree);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2789
            } finally {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2790
                lambdaTranslationMap = prevLambdaTranslationMap;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2791
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2792
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2793
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2794
    }
16325
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2795
    //where
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2796
        private Map<Symbol, Symbol> makeTranslationMap(JCMethodDecl tree) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2797
            Map<Symbol, Symbol> translationMap = new HashMap<Symbol,Symbol>();
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2798
            for (JCVariableDecl vd : tree.params) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2799
                Symbol p = vd.sym;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2800
                if (p != p.baseSymbol()) {
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2801
                    translationMap.put(p.baseSymbol(), p);
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2802
                }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2803
            }
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2804
            return translationMap;
088a91896245 8004962: Code generation crash with lambda and local classes
mcimadamore
parents: 15720
diff changeset
  2805
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2806
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14721
diff changeset
  2807
    public void visitAnnotatedType(JCAnnotatedType tree) {
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2808
        // No need to retain type annotations in the tree
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14721
diff changeset
  2809
        // tree.annotations = translate(tree.annotations);
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2810
        tree.annotations = List.nil();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14721
diff changeset
  2811
        tree.underlyingType = translate(tree.underlyingType);
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2812
        // but maintain type annotations in the type.
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2813
        if (tree.type.isAnnotated()) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2814
            if (tree.underlyingType.type.isAnnotated()) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2815
                // The erasure of a type variable might be annotated.
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2816
                // Merge all annotations.
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2817
                AnnotatedType newat = (AnnotatedType) tree.underlyingType.type;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2818
                AnnotatedType at = (AnnotatedType) tree.type;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2819
                at.underlyingType = newat.underlyingType;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2820
                newat.typeAnnotations = at.typeAnnotations.appendList(newat.typeAnnotations);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2821
                tree.type = newat;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2822
            } else {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2823
                // Create a new AnnotatedType to have the correct tag.
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2824
                AnnotatedType oldat = (AnnotatedType) tree.type;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2825
                tree.type = new AnnotatedType(tree.underlyingType.type);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2826
                ((AnnotatedType) tree.type).typeAnnotations = oldat.typeAnnotations;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2827
            }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2828
        }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16965
diff changeset
  2829
        result = tree;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14721
diff changeset
  2830
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 14721
diff changeset
  2831
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2832
    public void visitTypeCast(JCTypeCast tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2833
        tree.clazz = translate(tree.clazz);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2834
        if (tree.type.isPrimitive() != tree.expr.type.isPrimitive())
06bc494ca11e Initial load
duke
parents:
diff changeset
  2835
            tree.expr = translate(tree.expr, tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2836
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  2837
            tree.expr = translate(tree.expr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2838
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2839
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2840
06bc494ca11e Initial load
duke
parents:
diff changeset
  2841
    public void visitNewClass(JCNewClass tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2842
        ClassSymbol c = (ClassSymbol)tree.constructor.owner;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2843
06bc494ca11e Initial load
duke
parents:
diff changeset
  2844
        // Box arguments, if necessary
06bc494ca11e Initial load
duke
parents:
diff changeset
  2845
        boolean isEnum = (tree.constructor.owner.flags() & ENUM) != 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2846
        List<Type> argTypes = tree.constructor.type.getParameterTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2847
        if (isEnum) argTypes = argTypes.prepend(syms.intType).prepend(syms.stringType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2848
        tree.args = boxArgs(argTypes, tree.args, tree.varargsElement);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2849
        tree.varargsElement = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2850
06bc494ca11e Initial load
duke
parents:
diff changeset
  2851
        // If created class is local, add free variables after
06bc494ca11e Initial load
duke
parents:
diff changeset
  2852
        // explicit constructor arguments.
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
  2853
        if (c.isLocal()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2854
            tree.args = tree.args.appendList(loadFreevars(tree.pos(), freevars(c)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2855
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2856
06bc494ca11e Initial load
duke
parents:
diff changeset
  2857
        // If an access constructor is used, append null as a last argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2858
        Symbol constructor = accessConstructor(tree.pos(), tree.constructor);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2859
        if (constructor != tree.constructor) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2860
            tree.args = tree.args.append(makeNull());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2861
            tree.constructor = constructor;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2862
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2863
06bc494ca11e Initial load
duke
parents:
diff changeset
  2864
        // If created class has an outer instance, and new is qualified, pass
06bc494ca11e Initial load
duke
parents:
diff changeset
  2865
        // qualifier as first argument. If new is not qualified, pass the
06bc494ca11e Initial load
duke
parents:
diff changeset
  2866
        // correct outer instance as first argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2867
        if (c.hasOuterInstance()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2868
            JCExpression thisArg;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2869
            if (tree.encl != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2870
                thisArg = attr.makeNullCheck(translate(tree.encl));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2871
                thisArg.type = tree.encl.type;
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
  2872
            } else if (c.isLocal()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2873
                // local class
06bc494ca11e Initial load
duke
parents:
diff changeset
  2874
                thisArg = makeThis(tree.pos(), c.type.getEnclosingType().tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2875
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2876
                // nested class
06bc494ca11e Initial load
duke
parents:
diff changeset
  2877
                thisArg = makeOwnerThis(tree.pos(), c, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2878
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2879
            tree.args = tree.args.prepend(thisArg);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2880
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2881
        tree.encl = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2882
06bc494ca11e Initial load
duke
parents:
diff changeset
  2883
        // If we have an anonymous class, create its flat version, rather
06bc494ca11e Initial load
duke
parents:
diff changeset
  2884
        // than the class or interface following new.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2885
        if (tree.def != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2886
            translate(tree.def);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2887
            tree.clazz = access(make_at(tree.clazz.pos()).Ident(tree.def.sym));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2888
            tree.def = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2889
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2890
            tree.clazz = access(c, tree.clazz, enclOp, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2891
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2892
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2893
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2894
06bc494ca11e Initial load
duke
parents:
diff changeset
  2895
    // Simplify conditionals with known constant controlling expressions.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2896
    // This allows us to avoid generating supporting declarations for
06bc494ca11e Initial load
duke
parents:
diff changeset
  2897
    // the dead code, which will not be eliminated during code generation.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2898
    // Note that Flow.isFalse and Flow.isTrue only return true
06bc494ca11e Initial load
duke
parents:
diff changeset
  2899
    // for constant expressions in the sense of JLS 15.27, which
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  2900
    // are guaranteed to have no side-effects.  More aggressive
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2901
    // constant propagation would require that we take care to
06bc494ca11e Initial load
duke
parents:
diff changeset
  2902
    // preserve possible side-effects in the condition expression.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2903
06bc494ca11e Initial load
duke
parents:
diff changeset
  2904
    /** Visitor method for conditional expressions.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2905
     */
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2906
    @Override
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2907
    public void visitConditional(JCConditional tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2908
        JCTree cond = tree.cond = translate(tree.cond, syms.booleanType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2909
        if (cond.type.isTrue()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2910
            result = convert(translate(tree.truepart, tree.type), tree.type);
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2911
            addPrunedInfo(cond);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2912
        } else if (cond.type.isFalse()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2913
            result = convert(translate(tree.falsepart, tree.type), tree.type);
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2914
            addPrunedInfo(cond);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2915
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2916
            // Condition is not a compile-time constant.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2917
            tree.truepart = translate(tree.truepart, tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2918
            tree.falsepart = translate(tree.falsepart, tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2919
            result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2920
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2921
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2922
//where
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2923
    private JCTree convert(JCTree tree, Type pt) {
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2924
        if (tree.type == pt || tree.type.hasTag(BOT))
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2925
            return tree;
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2926
        JCTree result = make_at(tree.pos()).TypeCast(make.Type(pt), (JCExpression)tree);
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2927
        result.type = (tree.type.constValue() != null) ? cfolder.coerce(tree.type, pt)
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2928
                                                       : pt;
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2929
        return result;
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2930
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2931
06bc494ca11e Initial load
duke
parents:
diff changeset
  2932
    /** Visitor method for if statements.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2933
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2934
    public void visitIf(JCIf tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2935
        JCTree cond = tree.cond = translate(tree.cond, syms.booleanType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2936
        if (cond.type.isTrue()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2937
            result = translate(tree.thenpart);
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2938
            addPrunedInfo(cond);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2939
        } else if (cond.type.isFalse()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2940
            if (tree.elsepart != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2941
                result = translate(tree.elsepart);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2942
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2943
                result = make.Skip();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2944
            }
14721
071e3587f212 7153958: add constant pool reference to class containing inlined constants
vromero
parents: 14547
diff changeset
  2945
            addPrunedInfo(cond);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2946
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2947
            // Condition is not a compile-time constant.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2948
            tree.thenpart = translate(tree.thenpart);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2949
            tree.elsepart = translate(tree.elsepart);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2950
            result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2951
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2952
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2953
06bc494ca11e Initial load
duke
parents:
diff changeset
  2954
    /** Visitor method for assert statements. Translate them away.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2955
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2956
    public void visitAssert(JCAssert tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2957
        DiagnosticPosition detailPos = (tree.detail == null) ? tree.pos() : tree.detail.pos();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2958
        tree.cond = translate(tree.cond, syms.booleanType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2959
        if (!tree.cond.type.isTrue()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2960
            JCExpression cond = assertFlagTest(tree.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2961
            List<JCExpression> exnArgs = (tree.detail == null) ?
06bc494ca11e Initial load
duke
parents:
diff changeset
  2962
                List.<JCExpression>nil() : List.of(translate(tree.detail));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2963
            if (!tree.cond.type.isFalse()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2964
                cond = makeBinary
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2965
                    (AND,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2966
                     cond,
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  2967
                     makeUnary(NOT, tree.cond));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2968
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2969
            result =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2970
                make.If(cond,
17808
846139633c68 6970173: Debug pointer at bad position
vromero
parents: 17807
diff changeset
  2971
                        make_at(tree).
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2972
                           Throw(makeNewClass(syms.assertionErrorType, exnArgs)),
06bc494ca11e Initial load
duke
parents:
diff changeset
  2973
                        null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2974
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2975
            result = make.Skip();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2976
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2977
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2978
06bc494ca11e Initial load
duke
parents:
diff changeset
  2979
    public void visitApply(JCMethodInvocation tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2980
        Symbol meth = TreeInfo.symbol(tree.meth);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2981
        List<Type> argtypes = meth.type.getParameterTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2982
        if (allowEnums &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2983
            meth.name==names.init &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  2984
            meth.owner == syms.enumSym)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2985
            argtypes = argtypes.tail.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2986
        tree.args = boxArgs(argtypes, tree.args, tree.varargsElement);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2987
        tree.varargsElement = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2988
        Name methName = TreeInfo.name(tree.meth);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2989
        if (meth.name==names.init) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2990
            // We are seeing a this(...) or super(...) constructor call.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2991
            // If an access constructor is used, append null as a last argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2992
            Symbol constructor = accessConstructor(tree.pos(), meth);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2993
            if (constructor != meth) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2994
                tree.args = tree.args.append(makeNull());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2995
                TreeInfo.setSymbol(tree.meth, constructor);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2996
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2997
06bc494ca11e Initial load
duke
parents:
diff changeset
  2998
            // If we are calling a constructor of a local class, add
06bc494ca11e Initial load
duke
parents:
diff changeset
  2999
            // free variables after explicit constructor arguments.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3000
            ClassSymbol c = (ClassSymbol)constructor.owner;
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
  3001
            if (c.isLocal()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3002
                tree.args = tree.args.appendList(loadFreevars(tree.pos(), freevars(c)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3003
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3004
06bc494ca11e Initial load
duke
parents:
diff changeset
  3005
            // If we are calling a constructor of an enum class, pass
06bc494ca11e Initial load
duke
parents:
diff changeset
  3006
            // along the name and ordinal arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
  3007
            if ((c.flags_field&ENUM) != 0 || c.getQualifiedName() == names.java_lang_Enum) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3008
                List<JCVariableDecl> params = currentMethodDef.params;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3009
                if (currentMethodSym.owner.hasOuterInstance())
06bc494ca11e Initial load
duke
parents:
diff changeset
  3010
                    params = params.tail; // drop this$n
06bc494ca11e Initial load
duke
parents:
diff changeset
  3011
                tree.args = tree.args
06bc494ca11e Initial load
duke
parents:
diff changeset
  3012
                    .prepend(make_at(tree.pos()).Ident(params.tail.head.sym)) // ordinal
06bc494ca11e Initial load
duke
parents:
diff changeset
  3013
                    .prepend(make.Ident(params.head.sym)); // name
06bc494ca11e Initial load
duke
parents:
diff changeset
  3014
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3015
06bc494ca11e Initial load
duke
parents:
diff changeset
  3016
            // If we are calling a constructor of a class with an outer
06bc494ca11e Initial load
duke
parents:
diff changeset
  3017
            // instance, and the call
06bc494ca11e Initial load
duke
parents:
diff changeset
  3018
            // is qualified, pass qualifier as first argument in front of
06bc494ca11e Initial load
duke
parents:
diff changeset
  3019
            // the explicit constructor arguments. If the call
06bc494ca11e Initial load
duke
parents:
diff changeset
  3020
            // is not qualified, pass the correct outer instance as
06bc494ca11e Initial load
duke
parents:
diff changeset
  3021
            // first argument.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3022
            if (c.hasOuterInstance()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3023
                JCExpression thisArg;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3024
                if (tree.meth.hasTag(SELECT)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3025
                    thisArg = attr.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3026
                        makeNullCheck(translate(((JCFieldAccess) tree.meth).selected));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3027
                    tree.meth = make.Ident(constructor);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3028
                    ((JCIdent) tree.meth).name = methName;
19501
9dac9369db2c 8022053: javac generates unverifiable initializer for nested subclass of local class
vromero
parents: 19495
diff changeset
  3029
                } else if (c.isLocal() || methName == names._this){
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3030
                    // local class or this() call
06bc494ca11e Initial load
duke
parents:
diff changeset
  3031
                    thisArg = makeThis(tree.meth.pos(), c.type.getEnclosingType().tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3032
                } else {
8622
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8434
diff changeset
  3033
                    // super() call of nested class - never pick 'this'
4f032629a0fd 6541876: "Enclosing Instance" error new in 1.6
mcimadamore
parents: 8434
diff changeset
  3034
                    thisArg = makeOwnerThisN(tree.meth.pos(), c, false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3035
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3036
                tree.args = tree.args.prepend(thisArg);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3037
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3038
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3039
            // We are seeing a normal method invocation; translate this as usual.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3040
            tree.meth = translate(tree.meth);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3041
06bc494ca11e Initial load
duke
parents:
diff changeset
  3042
            // If the translated method itself is an Apply tree, we are
06bc494ca11e Initial load
duke
parents:
diff changeset
  3043
            // seeing an access method invocation. In this case, append
06bc494ca11e Initial load
duke
parents:
diff changeset
  3044
            // the method arguments to the arguments of the access method.
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3045
            if (tree.meth.hasTag(APPLY)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3046
                JCMethodInvocation app = (JCMethodInvocation)tree.meth;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3047
                app.args = tree.args.prependList(app.args);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3048
                result = app;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3049
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3050
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3051
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3052
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3053
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3054
06bc494ca11e Initial load
duke
parents:
diff changeset
  3055
    List<JCExpression> boxArgs(List<Type> parameters, List<JCExpression> _args, Type varargsElement) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3056
        List<JCExpression> args = _args;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3057
        if (parameters.isEmpty()) return args;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3058
        boolean anyChanges = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3059
        ListBuffer<JCExpression> result = new ListBuffer<JCExpression>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3060
        while (parameters.tail.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3061
            JCExpression arg = translate(args.head, parameters.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3062
            anyChanges |= (arg != args.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3063
            result.append(arg);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3064
            args = args.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3065
            parameters = parameters.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3066
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3067
        Type parameter = parameters.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3068
        if (varargsElement != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3069
            anyChanges = true;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3070
            ListBuffer<JCExpression> elems = new ListBuffer<JCExpression>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3071
            while (args.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3072
                JCExpression arg = translate(args.head, varargsElement);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3073
                elems.append(arg);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3074
                args = args.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3075
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3076
            JCNewArray boxedArgs = make.NewArray(make.Type(varargsElement),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3077
                                               List.<JCExpression>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3078
                                               elems.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3079
            boxedArgs.type = new ArrayType(varargsElement, syms.arrayClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3080
            result.append(boxedArgs);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3081
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3082
            if (args.length() != 1) throw new AssertionError(args);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3083
            JCExpression arg = translate(args.head, parameter);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3084
            anyChanges |= (arg != args.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3085
            result.append(arg);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3086
            if (!anyChanges) return _args;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3087
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3088
        return result.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3089
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3090
06bc494ca11e Initial load
duke
parents:
diff changeset
  3091
    /** Expand a boxing or unboxing conversion if needed. */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3092
    @SuppressWarnings("unchecked") // XXX unchecked
06bc494ca11e Initial load
duke
parents:
diff changeset
  3093
    <T extends JCTree> T boxIfNeeded(T tree, Type type) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3094
        boolean havePrimitive = tree.type.isPrimitive();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3095
        if (havePrimitive == type.isPrimitive())
06bc494ca11e Initial load
duke
parents:
diff changeset
  3096
            return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3097
        if (havePrimitive) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3098
            Type unboxedTarget = types.unboxedType(type);
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
  3099
            if (!unboxedTarget.hasTag(NONE)) {
2510
d7ba8e16a928 6816548: Uninitialized register when performing casting + auto(un)boxing
mcimadamore
parents: 2220
diff changeset
  3100
                if (!types.isSubtype(tree.type, unboxedTarget)) //e.g. Character c = 89;
d7ba8e16a928 6816548: Uninitialized register when performing casting + auto(un)boxing
mcimadamore
parents: 2220
diff changeset
  3101
                    tree.type = unboxedTarget.constType(tree.type.constValue());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3102
                return (T)boxPrimitive((JCExpression)tree, type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3103
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3104
                tree = (T)boxPrimitive((JCExpression)tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3105
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3106
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3107
            tree = (T)unbox((JCExpression)tree, type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3108
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3109
        return tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3110
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3111
06bc494ca11e Initial load
duke
parents:
diff changeset
  3112
    /** Box up a single primitive expression. */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3113
    JCExpression boxPrimitive(JCExpression tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3114
        return boxPrimitive(tree, types.boxedClass(tree.type).type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3115
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3116
06bc494ca11e Initial load
duke
parents:
diff changeset
  3117
    /** Box up a single primitive expression. */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3118
    JCExpression boxPrimitive(JCExpression tree, Type box) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3119
        make_at(tree.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3120
        if (target.boxWithConstructors()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3121
            Symbol ctor = lookupConstructor(tree.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3122
                                            box,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3123
                                            List.<Type>nil()
06bc494ca11e Initial load
duke
parents:
diff changeset
  3124
                                            .prepend(tree.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3125
            return make.Create(ctor, List.of(tree));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3126
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3127
            Symbol valueOfSym = lookupMethod(tree.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3128
                                             names.valueOf,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3129
                                             box,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3130
                                             List.<Type>nil()
06bc494ca11e Initial load
duke
parents:
diff changeset
  3131
                                             .prepend(tree.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3132
            return make.App(make.QualIdent(valueOfSym), List.of(tree));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3133
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3134
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3135
06bc494ca11e Initial load
duke
parents:
diff changeset
  3136
    /** Unbox an object to a primitive value. */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3137
    JCExpression unbox(JCExpression tree, Type primitive) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3138
        Type unboxedType = types.unboxedType(tree.type);
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14263
diff changeset
  3139
        if (unboxedType.hasTag(NONE)) {
6583
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3140
            unboxedType = primitive;
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3141
            if (!unboxedType.isPrimitive())
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3142
                throw new AssertionError(unboxedType);
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3143
            make_at(tree.pos());
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3144
            tree = make.TypeCast(types.boxedClass(unboxedType).type, tree);
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3145
        } else {
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3146
            // There must be a conversion from unboxedType to primitive.
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3147
            if (!types.isSubtype(unboxedType, primitive))
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3148
                throw new AssertionError(tree);
6410e8c9c848 6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case
jrose
parents: 6575
diff changeset
  3149
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3150
        make_at(tree.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3151
        Symbol valueSym = lookupMethod(tree.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3152
                                       unboxedType.tsym.name.append(names.Value), // x.intValue()
06bc494ca11e Initial load
duke
parents:
diff changeset
  3153
                                       tree.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3154
                                       List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3155
        return make.App(make.Select(tree, valueSym));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3156
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3157
06bc494ca11e Initial load
duke
parents:
diff changeset
  3158
    /** Visitor method for parenthesized expressions.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3159
     *  If the subexpression has changed, omit the parens.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3160
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3161
    public void visitParens(JCParens tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3162
        JCTree expr = translate(tree.expr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3163
        result = ((expr == tree.expr) ? tree : expr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3164
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3165
06bc494ca11e Initial load
duke
parents:
diff changeset
  3166
    public void visitIndexed(JCArrayAccess tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3167
        tree.indexed = translate(tree.indexed);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3168
        tree.index = translate(tree.index, syms.intType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3169
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3170
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3171
06bc494ca11e Initial load
duke
parents:
diff changeset
  3172
    public void visitAssign(JCAssign tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3173
        tree.lhs = translate(tree.lhs, tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3174
        tree.rhs = translate(tree.rhs, tree.lhs.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3175
06bc494ca11e Initial load
duke
parents:
diff changeset
  3176
        // If translated left hand side is an Apply, we are
06bc494ca11e Initial load
duke
parents:
diff changeset
  3177
        // seeing an access method invocation. In this case, append
06bc494ca11e Initial load
duke
parents:
diff changeset
  3178
        // right hand side as last argument of the access method.
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3179
        if (tree.lhs.hasTag(APPLY)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3180
            JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3181
            app.args = List.of(tree.rhs).prependList(app.args);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3182
            result = app;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3183
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3184
            result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3185
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3186
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3187
06bc494ca11e Initial load
duke
parents:
diff changeset
  3188
    public void visitAssignop(final JCAssignOp tree) {
16334
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3189
        JCTree lhsAccess = access(TreeInfo.skipParens(tree.lhs));
15712
fa256e8cfe33 7167125: Two variables after the same operation in a inner class return different results
vromero
parents: 15565
diff changeset
  3190
        final boolean boxingReq = !tree.lhs.type.isPrimitive() &&
fa256e8cfe33 7167125: Two variables after the same operation in a inner class return different results
vromero
parents: 15565
diff changeset
  3191
            tree.operator.type.getReturnType().isPrimitive();
fa256e8cfe33 7167125: Two variables after the same operation in a inner class return different results
vromero
parents: 15565
diff changeset
  3192
16334
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3193
        if (boxingReq || lhsAccess.hasTag(APPLY)) {
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3194
            // boxing required; need to rewrite as x = (unbox typeof x)(x op y);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3195
            // or if x == (typeof x)z then z = (unbox typeof x)((typeof x)z op y)
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3196
            // (but without recomputing x)
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3197
            JCTree newTree = abstractLval(tree.lhs, new TreeBuilder() {
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3198
                    public JCTree build(final JCTree lhs) {
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3199
                        JCTree.Tag newTag = tree.getTag().noAssignOp();
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3200
                        // Erasure (TransTypes) can change the type of
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3201
                        // tree.lhs.  However, we can still get the
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3202
                        // unerased type of tree.lhs as it is stored
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3203
                        // in tree.type in Attr.
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3204
                        Symbol newOperator = rs.resolveBinaryOperator(tree.pos(),
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3205
                                                                      newTag,
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3206
                                                                      attrEnv,
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3207
                                                                      tree.type,
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3208
                                                                      tree.rhs.type);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3209
                        JCExpression expr = (JCExpression)lhs;
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3210
                        if (expr.type != tree.type)
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3211
                            expr = make.TypeCast(tree.type, expr);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3212
                        JCBinary opResult = make.Binary(newTag, expr, tree.rhs);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3213
                        opResult.operator = newOperator;
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3214
                        opResult.type = newOperator.type.getReturnType();
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3215
                        JCExpression newRhs = boxingReq ?
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3216
                            make.TypeCast(types.unboxedType(tree.type), opResult) :
15712
fa256e8cfe33 7167125: Two variables after the same operation in a inner class return different results
vromero
parents: 15565
diff changeset
  3217
                            opResult;
16334
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3218
                        return make.Assign((JCExpression)lhs, newRhs).setType(tree.type);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3219
                    }
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3220
                });
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3221
            result = translate(newTree);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3222
            return;
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3223
        }
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3224
        tree.lhs = translate(tree.lhs, tree);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3225
        tree.rhs = translate(tree.rhs, tree.operator.type.getParameterTypes().tail.head);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3226
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3227
        // If translated left hand side is an Apply, we are
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3228
        // seeing an access method invocation. In this case, append
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3229
        // right hand side as last argument of the access method.
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3230
        if (tree.lhs.hasTag(APPLY)) {
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3231
            JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3232
            // if operation is a += on strings,
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3233
            // make sure to convert argument to string
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3234
            JCExpression rhs = (((OperatorSymbol)tree.operator).opcode == string_add)
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3235
              ? makeString(tree.rhs)
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3236
              : tree.rhs;
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3237
            app.args = List.of(rhs).prependList(app.args);
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3238
            result = app;
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3239
        } else {
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3240
            result = tree;
49b3f71982f6 8009170: Regression: javac generates redundant bytecode in assignop involving arrays
vromero
parents: 16325
diff changeset
  3241
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3242
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3243
06bc494ca11e Initial load
duke
parents:
diff changeset
  3244
    /** Lower a tree of the form e++ or e-- where e is an object type */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3245
    JCTree lowerBoxedPostop(final JCUnary tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3246
        // translate to tmp1=lval(e); tmp2=tmp1; tmp1 OP 1; tmp2
06bc494ca11e Initial load
duke
parents:
diff changeset
  3247
        // or
06bc494ca11e Initial load
duke
parents:
diff changeset
  3248
        // translate to tmp1=lval(e); tmp2=tmp1; (typeof tree)tmp1 OP 1; tmp2
06bc494ca11e Initial load
duke
parents:
diff changeset
  3249
        // where OP is += or -=
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3250
        final boolean cast = TreeInfo.skipParens(tree.arg).hasTag(TYPECAST);
1468
19d266637353 6751514: Unary post-increment with type variables crash javac during lowering
mcimadamore
parents: 1260
diff changeset
  3251
        return abstractLval(tree.arg, new TreeBuilder() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3252
                public JCTree build(final JCTree tmp1) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3253
                    return abstractRval(tmp1, tree.arg.type, new TreeBuilder() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3254
                            public JCTree build(final JCTree tmp2) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3255
                                JCTree.Tag opcode = (tree.hasTag(POSTINC))
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3256
                                    ? PLUS_ASG : MINUS_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3257
                                JCTree lhs = cast
06bc494ca11e Initial load
duke
parents:
diff changeset
  3258
                                    ? make.TypeCast(tree.arg.type, (JCExpression)tmp1)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3259
                                    : tmp1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3260
                                JCTree update = makeAssignop(opcode,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3261
                                                             lhs,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3262
                                                             make.Literal(1));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3263
                                return makeComma(update, tmp2);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3264
                            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3265
                        });
06bc494ca11e Initial load
duke
parents:
diff changeset
  3266
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3267
            });
06bc494ca11e Initial load
duke
parents:
diff changeset
  3268
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3269
06bc494ca11e Initial load
duke
parents:
diff changeset
  3270
    public void visitUnary(JCUnary tree) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3271
        boolean isUpdateOperator = tree.getTag().isIncOrDecUnaryOp();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3272
        if (isUpdateOperator && !tree.arg.type.isPrimitive()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3273
            switch(tree.getTag()) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3274
            case PREINC:            // ++ e
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3275
                    // translate to e += 1
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3276
            case PREDEC:            // -- e
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3277
                    // translate to e -= 1
06bc494ca11e Initial load
duke
parents:
diff changeset
  3278
                {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3279
                    JCTree.Tag opcode = (tree.hasTag(PREINC))
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3280
                        ? PLUS_ASG : MINUS_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3281
                    JCAssignOp newTree = makeAssignop(opcode,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3282
                                                    tree.arg,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3283
                                                    make.Literal(1));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3284
                    result = translate(newTree, tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3285
                    return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3286
                }
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3287
            case POSTINC:           // e ++
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3288
            case POSTDEC:           // e --
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3289
                {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3290
                    result = translate(lowerBoxedPostop(tree), tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3291
                    return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3292
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3293
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3294
            throw new AssertionError(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3295
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3296
06bc494ca11e Initial load
duke
parents:
diff changeset
  3297
        tree.arg = boxIfNeeded(translate(tree.arg, tree), tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3298
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3299
        if (tree.hasTag(NOT) && tree.arg.type.constValue() != null) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3300
            tree.type = cfolder.fold1(bool_not, tree.arg.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3301
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3302
06bc494ca11e Initial load
duke
parents:
diff changeset
  3303
        // If translated left hand side is an Apply, we are
06bc494ca11e Initial load
duke
parents:
diff changeset
  3304
        // seeing an access method invocation. In this case, return
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3305
        // that access method invocation as result.
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3306
        if (isUpdateOperator && tree.arg.hasTag(APPLY)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3307
            result = tree.arg;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3308
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3309
            result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3310
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3311
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3312
06bc494ca11e Initial load
duke
parents:
diff changeset
  3313
    public void visitBinary(JCBinary tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3314
        List<Type> formals = tree.operator.type.getParameterTypes();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3315
        JCTree lhs = tree.lhs = translate(tree.lhs, formals.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3316
        switch (tree.getTag()) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3317
        case OR:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3318
            if (lhs.type.isTrue()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3319
                result = lhs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3320
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3321
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3322
            if (lhs.type.isFalse()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3323
                result = translate(tree.rhs, formals.tail.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3324
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3325
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3326
            break;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3327
        case AND:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3328
            if (lhs.type.isFalse()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3329
                result = lhs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3330
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3331
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3332
            if (lhs.type.isTrue()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3333
                result = translate(tree.rhs, formals.tail.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3334
                return;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3335
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3336
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3337
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3338
        tree.rhs = translate(tree.rhs, formals.tail.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3339
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3340
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3341
06bc494ca11e Initial load
duke
parents:
diff changeset
  3342
    public void visitIdent(JCIdent tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3343
        result = access(tree.sym, tree, enclOp, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3344
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3345
06bc494ca11e Initial load
duke
parents:
diff changeset
  3346
    /** Translate away the foreach loop.  */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3347
    public void visitForeachLoop(JCEnhancedForLoop tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3348
        if (types.elemtype(tree.expr.type) == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3349
            visitIterableForeachLoop(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3350
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  3351
            visitArrayForeachLoop(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3352
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3353
        // where
06bc494ca11e Initial load
duke
parents:
diff changeset
  3354
        /**
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3355
         * A statement of the form
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3356
         *
06bc494ca11e Initial load
duke
parents:
diff changeset
  3357
         * <pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
  3358
         *     for ( T v : arrayexpr ) stmt;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3359
         * </pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
  3360
         *
06bc494ca11e Initial load
duke
parents:
diff changeset
  3361
         * (where arrayexpr is of an array type) gets translated to
06bc494ca11e Initial load
duke
parents:
diff changeset
  3362
         *
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  3363
         * <pre>{@code
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3364
         *     for ( { arraytype #arr = arrayexpr;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3365
         *             int #len = array.length;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3366
         *             int #i = 0; };
06bc494ca11e Initial load
duke
parents:
diff changeset
  3367
         *           #i < #len; i$++ ) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3368
         *         T v = arr$[#i];
06bc494ca11e Initial load
duke
parents:
diff changeset
  3369
         *         stmt;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3370
         *     }
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  3371
         * }</pre>
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3372
         *
06bc494ca11e Initial load
duke
parents:
diff changeset
  3373
         * where #arr, #len, and #i are freshly named synthetic local variables.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3374
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3375
        private void visitArrayForeachLoop(JCEnhancedForLoop tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3376
            make_at(tree.expr.pos());
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  3377
            VarSymbol arraycache = new VarSymbol(SYNTHETIC,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3378
                                                 names.fromString("arr" + target.syntheticNameChar()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3379
                                                 tree.expr.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3380
                                                 currentMethodSym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3381
            JCStatement arraycachedef = make.VarDef(arraycache, tree.expr);
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  3382
            VarSymbol lencache = new VarSymbol(SYNTHETIC,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3383
                                               names.fromString("len" + target.syntheticNameChar()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3384
                                               syms.intType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3385
                                               currentMethodSym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3386
            JCStatement lencachedef = make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3387
                VarDef(lencache, make.Select(make.Ident(arraycache), syms.lengthVar));
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  3388
            VarSymbol index = new VarSymbol(SYNTHETIC,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3389
                                            names.fromString("i" + target.syntheticNameChar()),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3390
                                            syms.intType,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3391
                                            currentMethodSym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3392
06bc494ca11e Initial load
duke
parents:
diff changeset
  3393
            JCVariableDecl indexdef = make.VarDef(index, make.Literal(INT, 0));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3394
            indexdef.init.type = indexdef.type = syms.intType.constType(0);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3395
06bc494ca11e Initial load
duke
parents:
diff changeset
  3396
            List<JCStatement> loopinit = List.of(arraycachedef, lencachedef, indexdef);
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3397
            JCBinary cond = makeBinary(LT, make.Ident(index), make.Ident(lencache));
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3398
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3399
            JCExpressionStatement step = make.Exec(makeUnary(PREINC, make.Ident(index)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3400
06bc494ca11e Initial load
duke
parents:
diff changeset
  3401
            Type elemtype = types.elemtype(tree.expr.type);
517
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3402
            JCExpression loopvarinit = make.Indexed(make.Ident(arraycache),
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3403
                                                    make.Ident(index)).setType(elemtype);
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3404
            JCVariableDecl loopvardef = (JCVariableDecl)make.VarDef(tree.var.mods,
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3405
                                                  tree.var.name,
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3406
                                                  tree.var.vartype,
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3407
                                                  loopvarinit).setType(tree.var.type);
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3408
            loopvardef.sym = tree.var.sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3409
            JCBlock body = make.
517
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3410
                Block(0, List.of(loopvardef, tree.body));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3411
06bc494ca11e Initial load
duke
parents:
diff changeset
  3412
            result = translate(make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3413
                               ForLoop(loopinit,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3414
                                       cond,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3415
                                       List.of(step),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3416
                                       body));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3417
            patchTargets(body, tree, result);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3418
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3419
        /** Patch up break and continue targets. */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3420
        private void patchTargets(JCTree body, final JCTree src, final JCTree dest) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3421
            class Patcher extends TreeScanner {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3422
                public void visitBreak(JCBreak tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3423
                    if (tree.target == src)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3424
                        tree.target = dest;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3425
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3426
                public void visitContinue(JCContinue tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3427
                    if (tree.target == src)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3428
                        tree.target = dest;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3429
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3430
                public void visitClassDef(JCClassDecl tree) {}
06bc494ca11e Initial load
duke
parents:
diff changeset
  3431
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3432
            new Patcher().scan(body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3433
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3434
        /**
06bc494ca11e Initial load
duke
parents:
diff changeset
  3435
         * A statement of the form
06bc494ca11e Initial load
duke
parents:
diff changeset
  3436
         *
06bc494ca11e Initial load
duke
parents:
diff changeset
  3437
         * <pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
  3438
         *     for ( T v : coll ) stmt ;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3439
         * </pre>
06bc494ca11e Initial load
duke
parents:
diff changeset
  3440
         *
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  3441
         * (where coll implements {@code Iterable<? extends T>}) gets translated to
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3442
         *
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  3443
         * <pre>{@code
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3444
         *     for ( Iterator<? extends T> #i = coll.iterator(); #i.hasNext(); ) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3445
         *         T v = (T) #i.next();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3446
         *         stmt;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3447
         *     }
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13689
diff changeset
  3448
         * }</pre>
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3449
         *
06bc494ca11e Initial load
duke
parents:
diff changeset
  3450
         * where #i is a freshly named synthetic local variable.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3451
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3452
        private void visitIterableForeachLoop(JCEnhancedForLoop tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3453
            make_at(tree.expr.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3454
            Type iteratorTarget = syms.objectType;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3455
            Type iterableType = types.asSuper(types.upperBound(tree.expr.type),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3456
                                              syms.iterableType.tsym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3457
            if (iterableType.getTypeArguments().nonEmpty())
06bc494ca11e Initial load
duke
parents:
diff changeset
  3458
                iteratorTarget = types.erasure(iterableType.getTypeArguments().head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3459
            Type eType = tree.expr.type;
16965
e00f419042b7 8011432: javac, compiler regression iterable + captured type
vromero
parents: 16558
diff changeset
  3460
            while (eType.hasTag(TYPEVAR)) {
e00f419042b7 8011432: javac, compiler regression iterable + captured type
vromero
parents: 16558
diff changeset
  3461
                eType = eType.getUpperBound();
e00f419042b7 8011432: javac, compiler regression iterable + captured type
vromero
parents: 16558
diff changeset
  3462
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3463
            tree.expr.type = types.erasure(eType);
16965
e00f419042b7 8011432: javac, compiler regression iterable + captured type
vromero
parents: 16558
diff changeset
  3464
            if (eType.isCompound())
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3465
                tree.expr = make.TypeCast(types.erasure(iterableType), tree.expr);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3466
            Symbol iterator = lookupMethod(tree.expr.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3467
                                           names.iterator,
16552
59519c4e7603 5053846: javac: MethodRef entries are duplicated in the constant pool
vromero
parents: 16336
diff changeset
  3468
                                           eType,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3469
                                           List.<Type>nil());
19941
8b91e8eb2d20 7047734: javac, the LVT is not generated correctly in several scenarios
vromero
parents: 19927
diff changeset
  3470
            VarSymbol itvar = new VarSymbol(SYNTHETIC, names.fromString("i" + target.syntheticNameChar()),
19495
0a4337ec0592 8013394: compile of iterator use fails with error \"defined in an inaccessible class or interface\"
vromero
parents: 18377
diff changeset
  3471
                                            types.erasure(types.asSuper(iterator.type.getReturnType(), syms.iteratorType.tsym)),
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3472
                                            currentMethodSym);
16552
59519c4e7603 5053846: javac: MethodRef entries are duplicated in the constant pool
vromero
parents: 16336
diff changeset
  3473
59519c4e7603 5053846: javac: MethodRef entries are duplicated in the constant pool
vromero
parents: 16336
diff changeset
  3474
             JCStatement init = make.
59519c4e7603 5053846: javac: MethodRef entries are duplicated in the constant pool
vromero
parents: 16336
diff changeset
  3475
                VarDef(itvar, make.App(make.Select(tree.expr, iterator)
59519c4e7603 5053846: javac: MethodRef entries are duplicated in the constant pool
vromero
parents: 16336
diff changeset
  3476
                     .setType(types.erasure(iterator.type))));
59519c4e7603 5053846: javac: MethodRef entries are duplicated in the constant pool
vromero
parents: 16336
diff changeset
  3477
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3478
            Symbol hasNext = lookupMethod(tree.expr.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3479
                                          names.hasNext,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3480
                                          itvar.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3481
                                          List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3482
            JCMethodInvocation cond = make.App(make.Select(make.Ident(itvar), hasNext));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3483
            Symbol next = lookupMethod(tree.expr.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3484
                                       names.next,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3485
                                       itvar.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3486
                                       List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3487
            JCExpression vardefinit = make.App(make.Select(make.Ident(itvar), next));
940
0d5cabfaffde 6500701: Enhanced for loop with generics generates faulty bytecode
mcimadamore
parents: 735
diff changeset
  3488
            if (tree.var.type.isPrimitive())
0d5cabfaffde 6500701: Enhanced for loop with generics generates faulty bytecode
mcimadamore
parents: 735
diff changeset
  3489
                vardefinit = make.TypeCast(types.upperBound(iteratorTarget), vardefinit);
0d5cabfaffde 6500701: Enhanced for loop with generics generates faulty bytecode
mcimadamore
parents: 735
diff changeset
  3490
            else
0d5cabfaffde 6500701: Enhanced for loop with generics generates faulty bytecode
mcimadamore
parents: 735
diff changeset
  3491
                vardefinit = make.TypeCast(tree.var.type, vardefinit);
517
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3492
            JCVariableDecl indexDef = (JCVariableDecl)make.VarDef(tree.var.mods,
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3493
                                                  tree.var.name,
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3494
                                                  tree.var.vartype,
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3495
                                                  vardefinit).setType(tree.var.type);
ea4702edd512 6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
mcimadamore
parents: 161
diff changeset
  3496
            indexDef.sym = tree.var.sym;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3497
            JCBlock body = make.Block(0, List.of(indexDef, tree.body));
2220
dfae517d8078 6807255: LineNumberTable wrong if enhanced-for-loops are used
mcimadamore
parents: 1468
diff changeset
  3498
            body.endpos = TreeInfo.endPos(tree.body);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3499
            result = translate(make.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3500
                ForLoop(List.of(init),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3501
                        cond,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3502
                        List.<JCExpressionStatement>nil(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3503
                        body));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3504
            patchTargets(body, tree, result);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3505
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3506
06bc494ca11e Initial load
duke
parents:
diff changeset
  3507
    public void visitVarDef(JCVariableDecl tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3508
        MethodSymbol oldMethodSym = currentMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3509
        tree.mods = translate(tree.mods);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3510
        tree.vartype = translate(tree.vartype);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3511
        if (currentMethodSym == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3512
            // A class or instance field initializer.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3513
            currentMethodSym =
06bc494ca11e Initial load
duke
parents:
diff changeset
  3514
                new MethodSymbol((tree.mods.flags&STATIC) | BLOCK,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3515
                                 names.empty, null,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3516
                                 currentClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3517
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3518
        if (tree.init != null) tree.init = translate(tree.init, tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3519
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3520
        currentMethodSym = oldMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3521
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3522
06bc494ca11e Initial load
duke
parents:
diff changeset
  3523
    public void visitBlock(JCBlock tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3524
        MethodSymbol oldMethodSym = currentMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3525
        if (currentMethodSym == null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3526
            // Block is a static or instance initializer.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3527
            currentMethodSym =
06bc494ca11e Initial load
duke
parents:
diff changeset
  3528
                new MethodSymbol(tree.flags | BLOCK,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3529
                                 names.empty, null,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3530
                                 currentClass);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3531
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3532
        super.visitBlock(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3533
        currentMethodSym = oldMethodSym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3534
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3535
06bc494ca11e Initial load
duke
parents:
diff changeset
  3536
    public void visitDoLoop(JCDoWhileLoop tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3537
        tree.body = translate(tree.body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3538
        tree.cond = translate(tree.cond, syms.booleanType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3539
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3540
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3541
06bc494ca11e Initial load
duke
parents:
diff changeset
  3542
    public void visitWhileLoop(JCWhileLoop tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3543
        tree.cond = translate(tree.cond, syms.booleanType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3544
        tree.body = translate(tree.body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3545
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3546
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3547
06bc494ca11e Initial load
duke
parents:
diff changeset
  3548
    public void visitForLoop(JCForLoop tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3549
        tree.init = translate(tree.init);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3550
        if (tree.cond != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3551
            tree.cond = translate(tree.cond, syms.booleanType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3552
        tree.step = translate(tree.step);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3553
        tree.body = translate(tree.body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3554
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3555
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3556
06bc494ca11e Initial load
duke
parents:
diff changeset
  3557
    public void visitReturn(JCReturn tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3558
        if (tree.expr != null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3559
            tree.expr = translate(tree.expr,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3560
                                  types.erasure(currentMethodDef
06bc494ca11e Initial load
duke
parents:
diff changeset
  3561
                                                .restype.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3562
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3563
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3564
06bc494ca11e Initial load
duke
parents:
diff changeset
  3565
    public void visitSwitch(JCSwitch tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3566
        Type selsuper = types.supertype(tree.selector.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3567
        boolean enumSwitch = selsuper != null &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  3568
            (tree.selector.type.tsym.flags() & ENUM) != 0;
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3569
        boolean stringSwitch = selsuper != null &&
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3570
            types.isSameType(tree.selector.type, syms.stringType);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3571
        Type target = enumSwitch ? tree.selector.type :
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3572
            (stringSwitch? syms.stringType : syms.intType);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3573
        tree.selector = translate(tree.selector, target);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3574
        tree.cases = translateCases(tree.cases);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3575
        if (enumSwitch) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3576
            result = visitEnumSwitch(tree);
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3577
        } else if (stringSwitch) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3578
            result = visitStringSwitch(tree);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3579
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3580
            result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3581
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3582
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3583
06bc494ca11e Initial load
duke
parents:
diff changeset
  3584
    public JCTree visitEnumSwitch(JCSwitch tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3585
        TypeSymbol enumSym = tree.selector.type.tsym;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3586
        EnumMapping map = mapForEnum(tree.pos(), enumSym);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3587
        make_at(tree.pos());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3588
        Symbol ordinalMethod = lookupMethod(tree.pos(),
06bc494ca11e Initial load
duke
parents:
diff changeset
  3589
                                            names.ordinal,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3590
                                            tree.selector.type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3591
                                            List.<Type>nil());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3592
        JCArrayAccess selector = make.Indexed(map.mapVar,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3593
                                        make.App(make.Select(tree.selector,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3594
                                                             ordinalMethod)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3595
        ListBuffer<JCCase> cases = new ListBuffer<JCCase>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3596
        for (JCCase c : tree.cases) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3597
            if (c.pat != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3598
                VarSymbol label = (VarSymbol)TreeInfo.symbol(c.pat);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3599
                JCLiteral pat = map.forConstant(label);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3600
                cases.append(make.Case(pat, c.stats));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3601
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3602
                cases.append(c);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3603
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3604
        }
4417
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3605
        JCSwitch enumSwitch = make.Switch(selector, cases.toList());
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3606
        patchTargets(enumSwitch, tree, enumSwitch);
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3607
        return enumSwitch;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3608
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3609
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3610
    public JCTree visitStringSwitch(JCSwitch tree) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3611
        List<JCCase> caseList = tree.getCases();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3612
        int alternatives = caseList.size();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3613
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3614
        if (alternatives == 0) { // Strange but legal possibility
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3615
            return make.at(tree.pos()).Exec(attr.makeNullCheck(tree.getExpression()));
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3616
        } else {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3617
            /*
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3618
             * The general approach used is to translate a single
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3619
             * string switch statement into a series of two chained
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3620
             * switch statements: the first a synthesized statement
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3621
             * switching on the argument string's hash value and
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3622
             * computing a string's position in the list of original
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3623
             * case labels, if any, followed by a second switch on the
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3624
             * computed integer value.  The second switch has the same
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3625
             * code structure as the original string switch statement
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3626
             * except that the string case labels are replaced with
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3627
             * positional integer constants starting at 0.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3628
             *
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3629
             * The first switch statement can be thought of as an
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3630
             * inlined map from strings to their position in the case
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3631
             * label list.  An alternate implementation would use an
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3632
             * actual Map for this purpose, as done for enum switches.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3633
             *
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3634
             * With some additional effort, it would be possible to
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3635
             * use a single switch statement on the hash code of the
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3636
             * argument, but care would need to be taken to preserve
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3637
             * the proper control flow in the presence of hash
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3638
             * collisions and other complications, such as
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3639
             * fallthroughs.  Switch statements with one or two
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3640
             * alternatives could also be specially translated into
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3641
             * if-then statements to omit the computation of the hash
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3642
             * code.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3643
             *
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3644
             * The generated code assumes that the hashing algorithm
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3645
             * of String is the same in the compilation environment as
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3646
             * in the environment the code will run in.  The string
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3647
             * hashing algorithm in the SE JDK has been unchanged
4417
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3648
             * since at least JDK 1.2.  Since the algorithm has been
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3649
             * specified since that release as well, it is very
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3650
             * unlikely to be changed in the future.
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3651
             *
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3652
             * Different hashing algorithms, such as the length of the
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3653
             * strings or a perfect hashing algorithm over the
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3654
             * particular set of case labels, could potentially be
fc5cc811d2dd 6906748: Project Coin: Minor strings in switch cleanup
darcy
parents: 4142
diff changeset
  3655
             * used instead of String.hashCode.
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3656
             */
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3657
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3658
            ListBuffer<JCStatement> stmtList = new ListBuffer<JCStatement>();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3659
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3660
            // Map from String case labels to their original position in
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3661
            // the list of case labels.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3662
            Map<String, Integer> caseLabelToPosition =
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3663
                new LinkedHashMap<String, Integer>(alternatives + 1, 1.0f);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3664
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3665
            // Map of hash codes to the string case labels having that hashCode.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3666
            Map<Integer, Set<String>> hashToString =
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3667
                new LinkedHashMap<Integer, Set<String>>(alternatives + 1, 1.0f);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3668
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3669
            int casePosition = 0;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3670
            for(JCCase oneCase : caseList) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3671
                JCExpression expression = oneCase.getExpression();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3672
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3673
                if (expression != null) { // expression for a "default" case is null
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3674
                    String labelExpr = (String) expression.type.constValue();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3675
                    Integer mapping = caseLabelToPosition.put(labelExpr, casePosition);
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  3676
                    Assert.checkNull(mapping);
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3677
                    int hashCode = labelExpr.hashCode();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3678
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3679
                    Set<String> stringSet = hashToString.get(hashCode);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3680
                    if (stringSet == null) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3681
                        stringSet = new LinkedHashSet<String>(1, 1.0f);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3682
                        stringSet.add(labelExpr);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3683
                        hashToString.put(hashCode, stringSet);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3684
                    } else {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3685
                        boolean added = stringSet.add(labelExpr);
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  3686
                        Assert.check(added);
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3687
                    }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3688
                }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3689
                casePosition++;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3690
            }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3691
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3692
            // Synthesize a switch statement that has the effect of
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3693
            // mapping from a string to the integer position of that
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3694
            // string in the list of case labels.  This is done by
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3695
            // switching on the hashCode of the string followed by an
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3696
            // if-then-else chain comparing the input for equality
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3697
            // with all the case labels having that hash value.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3698
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3699
            /*
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3700
             * s$ = top of stack;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3701
             * tmp$ = -1;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3702
             * switch($s.hashCode()) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3703
             *     case caseLabel.hashCode:
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3704
             *         if (s$.equals("caseLabel_1")
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3705
             *           tmp$ = caseLabelToPosition("caseLabel_1");
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3706
             *         else if (s$.equals("caseLabel_2"))
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3707
             *           tmp$ = caseLabelToPosition("caseLabel_2");
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3708
             *         ...
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3709
             *         break;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3710
             * ...
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3711
             * }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3712
             */
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3713
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3714
            VarSymbol dollar_s = new VarSymbol(FINAL|SYNTHETIC,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3715
                                               names.fromString("s" + tree.pos + target.syntheticNameChar()),
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3716
                                               syms.stringType,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3717
                                               currentMethodSym);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3718
            stmtList.append(make.at(tree.pos()).VarDef(dollar_s, tree.getExpression()).setType(dollar_s.type));
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3719
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3720
            VarSymbol dollar_tmp = new VarSymbol(SYNTHETIC,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3721
                                                 names.fromString("tmp" + tree.pos + target.syntheticNameChar()),
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3722
                                                 syms.intType,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3723
                                                 currentMethodSym);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3724
            JCVariableDecl dollar_tmp_def =
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3725
                (JCVariableDecl)make.VarDef(dollar_tmp, make.Literal(INT, -1)).setType(dollar_tmp.type);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3726
            dollar_tmp_def.init.type = dollar_tmp.type = syms.intType;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3727
            stmtList.append(dollar_tmp_def);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3728
            ListBuffer<JCCase> caseBuffer = ListBuffer.lb();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3729
            // hashCode will trigger nullcheck on original switch expression
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3730
            JCMethodInvocation hashCodeCall = makeCall(make.Ident(dollar_s),
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3731
                                                       names.hashCode,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3732
                                                       List.<JCExpression>nil()).setType(syms.intType);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3733
            JCSwitch switch1 = make.Switch(hashCodeCall,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3734
                                        caseBuffer.toList());
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3735
            for(Map.Entry<Integer, Set<String>> entry : hashToString.entrySet()) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3736
                int hashCode = entry.getKey();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3737
                Set<String> stringsWithHashCode = entry.getValue();
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 8031
diff changeset
  3738
                Assert.check(stringsWithHashCode.size() >= 1);
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3739
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3740
                JCStatement elsepart = null;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3741
                for(String caseLabel : stringsWithHashCode ) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3742
                    JCMethodInvocation stringEqualsCall = makeCall(make.Ident(dollar_s),
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3743
                                                                   names.equals,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3744
                                                                   List.<JCExpression>of(make.Literal(caseLabel)));
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3745
                    elsepart = make.If(stringEqualsCall,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3746
                                       make.Exec(make.Assign(make.Ident(dollar_tmp),
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3747
                                                             make.Literal(caseLabelToPosition.get(caseLabel))).
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3748
                                                 setType(dollar_tmp.type)),
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3749
                                       elsepart);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3750
                }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3751
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3752
                ListBuffer<JCStatement> lb = ListBuffer.lb();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3753
                JCBreak breakStmt = make.Break(null);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3754
                breakStmt.target = switch1;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3755
                lb.append(elsepart).append(breakStmt);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3756
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3757
                caseBuffer.append(make.Case(make.Literal(hashCode), lb.toList()));
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3758
            }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3759
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3760
            switch1.cases = caseBuffer.toList();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3761
            stmtList.append(switch1);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3762
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3763
            // Make isomorphic switch tree replacing string labels
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3764
            // with corresponding integer ones from the label to
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3765
            // position map.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3766
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3767
            ListBuffer<JCCase> lb = ListBuffer.lb();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3768
            JCSwitch switch2 = make.Switch(make.Ident(dollar_tmp), lb.toList());
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3769
            for(JCCase oneCase : caseList ) {
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3770
                // Rewire up old unlabeled break statements to the
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3771
                // replacement switch being created.
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3772
                patchTargets(oneCase, tree, switch2);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3773
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3774
                boolean isDefault = (oneCase.getExpression() == null);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3775
                JCExpression caseExpr;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3776
                if (isDefault)
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3777
                    caseExpr = null;
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3778
                else {
10201
52da97a48f81 7071246: Enclosing string literal in parenthesis in switch-case crashes javac
darcy
parents: 8622
diff changeset
  3779
                    caseExpr = make.Literal(caseLabelToPosition.get((String)TreeInfo.skipParens(oneCase.
52da97a48f81 7071246: Enclosing string literal in parenthesis in switch-case crashes javac
darcy
parents: 8622
diff changeset
  3780
                                                                                                getExpression()).
4142
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3781
                                                                    type.constValue()));
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3782
                }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3783
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3784
                lb.append(make.Case(caseExpr,
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3785
                                    oneCase.getStatements()));
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3786
            }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3787
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3788
            switch2.cases = lb.toList();
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3789
            stmtList.append(switch2);
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3790
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3791
            return make.Block(0L, stmtList.toList());
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3792
        }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3793
    }
bd950c8f4fb3 6827009: Project Coin: Strings in Switch
darcy
parents: 3557
diff changeset
  3794
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3795
    public void visitNewArray(JCNewArray tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3796
        tree.elemtype = translate(tree.elemtype);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3797
        for (List<JCExpression> t = tree.dims; t.tail != null; t = t.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3798
            if (t.head != null) t.head = translate(t.head, syms.intType);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3799
        tree.elems = translate(tree.elems, types.elemtype(tree.type));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3800
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3801
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3802
06bc494ca11e Initial load
duke
parents:
diff changeset
  3803
    public void visitSelect(JCFieldAccess tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3804
        // need to special case-access of the form C.super.x
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3805
        // these will always need an access method, unless C
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3806
        // is a default interface subclassed by the current class.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3807
        boolean qualifiedSuperAccess =
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3808
            tree.selected.hasTag(SELECT) &&
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3809
            TreeInfo.name(tree.selected) == names._super &&
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14444
diff changeset
  3810
            !types.isDirectSuperInterface(((JCFieldAccess)tree.selected).selected.type.tsym, currentClass);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3811
        tree.selected = translate(tree.selected);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3812
        if (tree.name == names._class) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3813
            result = classOf(tree.selected);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3814
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3815
        else if (tree.name == names._super &&
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14444
diff changeset
  3816
                types.isDirectSuperInterface(tree.selected.type.tsym, currentClass)) {
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3817
            //default super call!! Not a classic qualified super call
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3818
            TypeSymbol supSym = tree.selected.type.tsym;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3819
            Assert.checkNonNull(types.asSuper(currentClass.type, supSym));
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3820
            result = tree;
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3821
        }
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3822
        else if (tree.name == names._this || tree.name == names._super) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3823
            result = makeThis(tree.pos(), tree.selected.type.tsym);
14443
91c05eb19277 7192246: Add type-checking support for default methods
mcimadamore
parents: 14359
diff changeset
  3824
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3825
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
  3826
            result = access(tree.sym, tree, enclOp, qualifiedSuperAccess);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3827
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3828
06bc494ca11e Initial load
duke
parents:
diff changeset
  3829
    public void visitLetExpr(LetExpr tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3830
        tree.defs = translateVarDefs(tree.defs);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3831
        tree.expr = translate(tree.expr, tree.type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3832
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3833
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3834
06bc494ca11e Initial load
duke
parents:
diff changeset
  3835
    // There ought to be nothing to rewrite here;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3836
    // we don't generate code.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3837
    public void visitAnnotation(JCAnnotation tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3838
        result = tree;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3839
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3840
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  3841
    @Override
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  3842
    public void visitTry(JCTry tree) {
19927
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3843
        if (tree.resources.nonEmpty()) {
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3844
            result = makeTwrTry(tree);
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3845
            return;
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3846
        }
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3847
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3848
        boolean hasBody = tree.body.getStatements().nonEmpty();
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3849
        boolean hasCatchers = tree.catchers.nonEmpty();
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3850
        boolean hasFinally = tree.finalizer != null &&
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3851
                tree.finalizer.getStatements().nonEmpty();
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3852
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3853
        if (!hasCatchers && !hasFinally) {
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3854
            result = translate(tree.body);
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3855
            return;
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3856
        }
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3857
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3858
        if (!hasBody) {
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3859
            if (hasFinally) {
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3860
                result = translate(tree.finalizer);
16336
cf436a619e34 6181889: Empty try/finally results in bytecodes being generated
vromero
parents: 16334
diff changeset
  3861
            } else {
19927
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3862
                result = translate(tree.body);
16336
cf436a619e34 6181889: Empty try/finally results in bytecodes being generated
vromero
parents: 16334
diff changeset
  3863
            }
19927
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3864
            return;
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  3865
        }
19927
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3866
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3867
        // no optimizations possible
8793c5627ba7 8024398: javac, compiler crashes with try with empty body
vromero
parents: 19923
diff changeset
  3868
        super.visitTry(tree);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  3869
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  3870
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3871
/**************************************************************************
06bc494ca11e Initial load
duke
parents:
diff changeset
  3872
 * main method
06bc494ca11e Initial load
duke
parents:
diff changeset
  3873
 *************************************************************************/
06bc494ca11e Initial load
duke
parents:
diff changeset
  3874
06bc494ca11e Initial load
duke
parents:
diff changeset
  3875
    /** Translate a toplevel class and return a list consisting of
06bc494ca11e Initial load
duke
parents:
diff changeset
  3876
     *  the translated class and translated versions of all inner classes.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3877
     *  @param env   The attribution environment current at the class definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3878
     *               We need this for resolving some additional symbols.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3879
     *  @param cdef  The tree representing the class definition.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3880
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3881
    public List<JCTree> translateTopLevelClass(Env<AttrContext> env, JCTree cdef, TreeMaker make) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3882
        ListBuffer<JCTree> translated = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3883
        try {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3884
            attrEnv = env;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3885
            this.make = make;
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  3886
            endPosTable = env.toplevel.endPositions;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3887
            currentClass = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3888
            currentMethodDef = null;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10627
diff changeset
  3889
            outermostClassDef = (cdef.hasTag(CLASSDEF)) ? (JCClassDecl)cdef : null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3890
            outermostMemberDef = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3891
            this.translated = new ListBuffer<JCTree>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3892
            classdefs = new HashMap<ClassSymbol,JCClassDecl>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3893
            actualSymbols = new HashMap<Symbol,Symbol>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3894
            freevarCache = new HashMap<ClassSymbol,List<VarSymbol>>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3895
            proxies = new Scope(syms.noSymbol);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6029
diff changeset
  3896
            twrVars = new Scope(syms.noSymbol);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3897
            outerThisStack = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3898
            accessNums = new HashMap<Symbol,Integer>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3899
            accessSyms = new HashMap<Symbol,MethodSymbol[]>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3900
            accessConstrs = new HashMap<Symbol,MethodSymbol>();
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
  3901
            accessConstrTags = List.nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3902
            accessed = new ListBuffer<Symbol>();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3903
            translate(cdef, (JCExpression)null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3904
            for (List<Symbol> l = accessed.toList(); l.nonEmpty(); l = l.tail)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3905
                makeAccessible(l.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3906
            for (EnumMapping map : enumSwitchMap.values())
06bc494ca11e Initial load
duke
parents:
diff changeset
  3907
                map.translate();
3557
a803afefa115 6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
mcimadamore
parents: 3300
diff changeset
  3908
            checkConflicts(this.translated.toList());
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
  3909
            checkAccessConstructorTags();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3910
            translated = this.translated;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3911
        } finally {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3912
            // note that recursive invocations of this method fail hard
06bc494ca11e Initial load
duke
parents:
diff changeset
  3913
            attrEnv = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3914
            this.make = null;
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  3915
            endPosTable = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3916
            currentClass = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3917
            currentMethodDef = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3918
            outermostClassDef = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3919
            outermostMemberDef = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3920
            this.translated = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3921
            classdefs = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3922
            actualSymbols = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3923
            freevarCache = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3924
            proxies = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3925
            outerThisStack = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3926
            accessNums = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3927
            accessSyms = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3928
            accessConstrs = null;
6029
89f2c9b62d31 6917288: Unnamed nested class is not generated
jjg
parents: 5847
diff changeset
  3929
            accessConstrTags = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3930
            accessed = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3931
            enumSwitchMap.clear();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3932
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3933
        return translated.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3934
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3935
}