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