src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java
author chegar
Thu, 17 Oct 2019 20:54:25 +0100
branchdatagramsocketimpl-branch
changeset 58679 9c3209ff7550
parent 58678 9cf78a70fa4f
parent 58299 6df94ce3ab2f
permissions -rw-r--r--
datagramsocketimpl-branch: merge with default
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     1
/*
58299
6df94ce3ab2f 8229201: Update Graal
dlong
parents: 55509
diff changeset
     2
 * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     4
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     7
 * published by the Free Software Foundation.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     8
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    13
 * accompanied this code).
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    14
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    18
 *
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    21
 * questions.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    22
 */
50858
2d3e99a72541 8205824: Update Graal
never
parents: 49873
diff changeset
    23
2d3e99a72541 8205824: Update Graal
never
parents: 49873
diff changeset
    24
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    25
package org.graalvm.compiler.hotspot.phases.aot;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    26
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    27
import static org.graalvm.util.CollectionsUtil.anyMatch;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    28
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    29
import java.util.ArrayList;
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    30
import java.util.Iterator;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    31
import java.util.List;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    32
49873
26ebfe8ce852 8199755: Update Graal
dlong
parents: 48861
diff changeset
    33
import jdk.internal.vm.compiler.collections.EconomicSet;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    34
import org.graalvm.compiler.graph.Node;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    35
import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    36
import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    37
import org.graalvm.compiler.nodes.AbstractMergeNode;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    38
import org.graalvm.compiler.nodes.FixedNode;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    39
import org.graalvm.compiler.nodes.FixedWithNextNode;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    40
import org.graalvm.compiler.nodes.Invoke;
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    41
import org.graalvm.compiler.nodes.StructuredGraph;
55509
d58442b8abc1 8225497: Update Graal
jwilhelm
parents: 52910
diff changeset
    42
import org.graalvm.compiler.nodes.spi.CoreProviders;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    43
import org.graalvm.compiler.phases.BasePhase;
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    44
import org.graalvm.compiler.phases.graph.MergeableState;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    45
import org.graalvm.compiler.phases.graph.PostOrderNodeIterator;
44516
6da0313ebe17 8177856: [AOT] EliminateRedundantInitializationPhase is not working
iveresov
parents: 43972
diff changeset
    46
55509
d58442b8abc1 8225497: Update Graal
jwilhelm
parents: 52910
diff changeset
    47
import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
d58442b8abc1 8225497: Update Graal
jwilhelm
parents: 52910
diff changeset
    48
import jdk.vm.ci.meta.Constant;
d58442b8abc1 8225497: Update Graal
jwilhelm
parents: 52910
diff changeset
    49
import jdk.vm.ci.meta.ResolvedJavaType;
d58442b8abc1 8225497: Update Graal
jwilhelm
parents: 52910
diff changeset
    50
d58442b8abc1 8225497: Update Graal
jwilhelm
parents: 52910
diff changeset
    51
public class EliminateRedundantInitializationPhase extends BasePhase<CoreProviders> {
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    52
    /**
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    53
     * Find each {@link Invoke} that has a corresponding {@link InitializeKlassNode}. These
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    54
     * {@link InitializeKlassNode} are redundant and are removed.
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    55
     */
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    56
    private static void removeInitsAtStaticCalls(StructuredGraph graph) {
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    57
        for (Invoke invoke : graph.getInvokes()) {
52910
583fd71c47d6 8214023: Update Graal
dlong
parents: 50858
diff changeset
    58
            Node classInit = invoke.classInit();
583fd71c47d6 8214023: Update Graal
dlong
parents: 50858
diff changeset
    59
            if (classInit != null) {
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    60
                classInit.replaceAtUsages(null);
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    61
                graph.removeFixed((FixedWithNextNode) classInit);
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    62
            }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    63
        }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    64
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    65
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    66
    /**
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    67
     * Remove redundant {@link InitializeKlassNode} or {@link ResolveConstantNode} instances from
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    68
     * the graph.
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    69
     *
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    70
     * @param graph the program graph
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    71
     */
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    72
    private static void removeRedundantInits(StructuredGraph graph) {
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    73
        // Find and remove redundant nodes from the graph.
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    74
        List<FixedWithNextNode> redundantNodes = findRedundantInits(graph);
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    75
        for (FixedWithNextNode n : redundantNodes) {
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    76
            graph.removeFixed(n);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    77
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    78
    }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    79
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    80
    /**
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    81
     * Find {@link InitializeKlassNode} and {@link ResolveConstantNode} instances that can be
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    82
     * removed because there is an existing dominating node.
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    83
     *
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    84
     * @param graph the program graph
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    85
     */
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    86
    private static List<FixedWithNextNode> findRedundantInits(StructuredGraph graph) {
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    87
        EliminateRedundantInitializationIterator i = new EliminateRedundantInitializationIterator(graph.start(), new InitializedTypes());
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    88
        i.apply();
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
    89
        return i.getRedundantNodes();
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    90
    }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    91
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    92
    /**
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    93
     * State for {@link EliminateRedundantInitializationIterator}.
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
    94
     */
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    95
    private static class InitializedTypes extends MergeableState<InitializedTypes> implements Cloneable {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    96
        private EconomicSet<ResolvedJavaType> types;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    97
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    98
        InitializedTypes() {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
    99
            types = EconomicSet.create();
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   100
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   101
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   102
        private InitializedTypes(EconomicSet<ResolvedJavaType> types) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   103
            this.types = types;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   104
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   105
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   106
        @Override
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   107
        public InitializedTypes clone() {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   108
            return new InitializedTypes(EconomicSet.create(types));
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   109
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   110
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   111
        public boolean contains(ResolvedJavaType type) {
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   112
            if (type.isInterface() || type.isArray()) {
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   113
                // Check for exact match for interfaces
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   114
                return types.contains(type);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   115
            }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   116
            // For other types see if there is the same type or a subtype
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   117
            return anyMatch(types, t -> type.isAssignableFrom(t));
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   118
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   119
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   120
        public void add(ResolvedJavaType type) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   121
            types.add(type);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   122
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   123
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   124
        /**
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   125
         * Merge two given types. Interfaces and arrays have to be the same to merge successfully.
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   126
         * For other types the answer is the LCA.
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   127
         *
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   128
         * @param a initialized type
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   129
         * @param b initialized type
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   130
         * @return lowest common type that is initialized if either a or b are initialized, null if
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   131
         *         no such type exists.
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   132
         */
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   133
        private static ResolvedJavaType merge(ResolvedJavaType a, ResolvedJavaType b) {
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   134
            // We want exact match for interfaces or arrays
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   135
            if (a.isInterface() || b.isInterface() || a.isArray() || b.isArray()) {
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   136
                if (a.equals(b)) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   137
                    return a;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   138
                } else {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   139
                    return null;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   140
                }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   141
            } else {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   142
                // And LCA for other types
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   143
                ResolvedJavaType c = a.findLeastCommonAncestor(b);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   144
                if (c.isJavaLangObject()) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   145
                    // Not a very useful type, always initialized, don't pollute the sets.
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   146
                    return null;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   147
                }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   148
                return c;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   149
            }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   150
        }
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   151
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   152
        /**
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   153
         * Merge two sets of types. Essentially a computation of the LCA for each element of the
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   154
         * cartesian product of the input sets. Interfaces have to match exactly.
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   155
         *
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   156
         * @param a set of initialized types
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   157
         * @param b set of initialized types
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   158
         * @return set of common types that would be initialized if types in either a or b are
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   159
         *         initialized
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   160
         */
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   161
        private static EconomicSet<ResolvedJavaType> merge(EconomicSet<ResolvedJavaType> a, EconomicSet<ResolvedJavaType> b) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   162
            EconomicSet<ResolvedJavaType> c = EconomicSet.create();
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   163
            for (ResolvedJavaType ta : a) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   164
                for (ResolvedJavaType tb : b) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   165
                    ResolvedJavaType tc = merge(ta, tb);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   166
                    if (tc != null) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   167
                        c.add(tc);
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   168
                        if (tc.isInterface() || tc.isArray()) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   169
                            // Interfaces and arrays are not going merge with anything else, so bail
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   170
                            // out early.
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   171
                            break;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   172
                        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   173
                    }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   174
                }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   175
            }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   176
            return c;
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   177
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   178
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   179
        @Override
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   180
        public boolean merge(AbstractMergeNode merge, List<InitializedTypes> withStates) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   181
            for (InitializedTypes ts : withStates) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   182
                types = merge(types, ts.types);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   183
            }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   184
            return true;
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   185
        }
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   186
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   187
        protected static String toString(EconomicSet<ResolvedJavaType> types) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   188
            StringBuilder b = new StringBuilder();
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   189
            b.append("[");
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   190
            Iterator<ResolvedJavaType> i = types.iterator();
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   191
            while (i.hasNext()) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   192
                ResolvedJavaType t = i.next();
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   193
                b.append(t.toString());
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   194
                if (i.hasNext()) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   195
                    b.append(",");
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   196
                }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   197
            }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   198
            b.append("]");
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   199
            return b.toString();
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   200
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   201
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   202
        @Override
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   203
        public String toString() {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   204
            return toString(types);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   205
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   206
    }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   207
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   208
    /**
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   209
     * Do data flow analysis of class initializations and array resolutions. Collect redundant
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   210
     * nodes.
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   211
     */
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   212
    private static class EliminateRedundantInitializationIterator extends PostOrderNodeIterator<InitializedTypes> {
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   213
        private List<FixedWithNextNode> redundantNodes = new ArrayList<>();
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   214
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   215
        public List<FixedWithNextNode> getRedundantNodes() {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   216
            return redundantNodes;
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   217
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   218
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   219
        EliminateRedundantInitializationIterator(FixedNode start, InitializedTypes initialState) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   220
            super(start, initialState);
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   221
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   222
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   223
        private void processType(FixedWithNextNode node, Constant c) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   224
            HotSpotMetaspaceConstant klass = (HotSpotMetaspaceConstant) c;
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   225
            ResolvedJavaType t = klass.asResolvedJavaType();
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   226
            if (t != null) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   227
                if (state.contains(t)) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   228
                    redundantNodes.add(node);
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   229
                } else {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   230
                    state.add(t);
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   231
                }
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   232
            }
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   233
        }
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   234
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   235
        @Override
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   236
        protected void node(FixedNode node) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   237
            if (node instanceof InitializeKlassNode) {
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   238
                InitializeKlassNode i = (InitializeKlassNode) node;
46566
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   239
                if (i.value().isConstant()) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   240
                    processType(i, i.value().asConstant());
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   241
                }
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   242
            } else if (node instanceof ResolveConstantNode) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   243
                ResolveConstantNode r = (ResolveConstantNode) node;
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   244
                if (r.hasNoUsages()) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   245
                    if (r.value().isConstant()) {
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   246
                        processType(r, r.value().asConstant());
231c681fa946 8182883: Update Graal
iveresov
parents: 46459
diff changeset
   247
                    }
46459
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   248
                }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   249
            }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   250
        }
7d4e637d3f21 8180267: Update Graal
kvn
parents: 46388
diff changeset
   251
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   252
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   253
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   254
    @Override
55509
d58442b8abc1 8225497: Update Graal
jwilhelm
parents: 52910
diff changeset
   255
    protected void run(StructuredGraph graph, CoreProviders context) {
43972
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   256
        removeInitsAtStaticCalls(graph);
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   257
        removeRedundantInits(graph);
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   258
    }
1ade39b8381b 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents:
diff changeset
   259
}