truffle: graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java annotate

annotate graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java @ 11310:9f317a663366

Fix unused import.

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Thu, 15 Aug 2013 19:46:05 +0200
parents	2f216d44bce4
children	12fe444e68d2

rev	line source
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	1 /*
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	2 * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	4 *
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	5 * This code is free software; you can redistribute it and/or modify it
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	7 * published by the Free Software Foundation.
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	8 *
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	13 * accompanied this code).
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	14 *
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	15 * You should have received a copy of the GNU General Public License version
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	18 *
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	20 * or visit www.oracle.com if you need additional information or have any
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	21 * questions.
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	22 */
6526 ee651c726397 split phases out of graal.phases project into graal.phases.common project Doug Simon <doug.simon@oracle.com> parents: 6525 diff changeset	23 package com.oracle.graal.phases.common;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	24
10767 88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	25 import java.lang.reflect.*;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	26 import java.util.*;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	27
5507 dc71b06d09f8 Moving classes from cri.ri to api.meta. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5443 diff changeset	28 import com.oracle.graal.api.meta.*;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	29 import com.oracle.graal.debug.*;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	30 import com.oracle.graal.graph.*;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	31 import com.oracle.graal.nodes.*;
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	32 import com.oracle.graal.nodes.PhiNode.PhiType;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	33 import com.oracle.graal.nodes.calc.*;
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	34 import com.oracle.graal.nodes.extended.*;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	35 import com.oracle.graal.nodes.java.*;
10767 88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	36 import com.oracle.graal.nodes.java.MethodCallTargetNode.*;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	37 import com.oracle.graal.nodes.type.*;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	38 import com.oracle.graal.nodes.util.*;
6526 ee651c726397 split phases out of graal.phases project into graal.phases.common project Doug Simon <doug.simon@oracle.com> parents: 6525 diff changeset	39 import com.oracle.graal.phases.*;
6525 2c913b643422 rename packages in graal.phases to match project name Doug Simon <doug.simon@oracle.com> parents: 6522 diff changeset	40 import com.oracle.graal.phases.graph.*;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	41
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	42 public class ConditionalEliminationPhase extends Phase {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	43
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	44 private static final DebugMetric metricConditionRegistered = Debug.metric("ConditionRegistered");
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	45 private static final DebugMetric metricTypeRegistered = Debug.metric("TypeRegistered");
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	46 private static final DebugMetric metricNullnessRegistered = Debug.metric("NullnessRegistered");
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	47 private static final DebugMetric metricObjectEqualsRegistered = Debug.metric("ObjectEqualsRegistered");
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	48 private static final DebugMetric metricCheckCastRemoved = Debug.metric("CheckCastRemoved");
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	49 private static final DebugMetric metricInstanceOfRemoved = Debug.metric("InstanceOfRemoved");
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	50 private static final DebugMetric metricNullCheckRemoved = Debug.metric("NullCheckRemoved");
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	51 private static final DebugMetric metricObjectEqualsRemoved = Debug.metric("ObjectEqualsRemoved");
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	52 private static final DebugMetric metricGuardsRemoved = Debug.metric("GuardsRemoved");
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	53
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	54 private final MetaAccessProvider metaAccessProvider;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	55
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	56 private StructuredGraph graph;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	57
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	58 public ConditionalEliminationPhase(MetaAccessProvider metaAccessProvider) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	59 this.metaAccessProvider = metaAccessProvider;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	60 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	61
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	62 @Override
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	63 protected void run(StructuredGraph inputGraph) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	64 graph = inputGraph;
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	65 new ConditionalElimination(graph.start(), new State()).apply();
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	66 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	67
10803 4532725151cc make MergeableState an abstract class instead of an interface Lukas Stadler <lukas.stadler@jku.at> parents: 10802 diff changeset	68 public static class State extends MergeableState<State> {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	69
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	70 private IdentityHashMap<ValueNode, ResolvedJavaType> knownTypes;
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	71 private HashSet<ValueNode> knownNonNull;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	72 private HashSet<ValueNode> knownNull;
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	73 private IdentityHashMap<LogicNode, ValueNode> trueConditions;
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	74 private IdentityHashMap<LogicNode, ValueNode> falseConditions;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	75
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	76 public State() {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	77 this.knownTypes = new IdentityHashMap<>();
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	78 this.knownNonNull = new HashSet<>();
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	79 this.knownNull = new HashSet<>();
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	80 this.trueConditions = new IdentityHashMap<>();
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	81 this.falseConditions = new IdentityHashMap<>();
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	82 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	83
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	84 public State(State other) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	85 this.knownTypes = new IdentityHashMap<>(other.knownTypes);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	86 this.knownNonNull = new HashSet<>(other.knownNonNull);
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	87 this.knownNull = new HashSet<>(other.knownNull);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	88 this.trueConditions = new IdentityHashMap<>(other.trueConditions);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	89 this.falseConditions = new IdentityHashMap<>(other.falseConditions);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	90 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	91
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	92 @Override
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	93 public boolean merge(MergeNode merge, List<State> withStates) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	94 IdentityHashMap<ValueNode, ResolvedJavaType> newKnownTypes = new IdentityHashMap<>();
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	95 IdentityHashMap<LogicNode, ValueNode> newTrueConditions = new IdentityHashMap<>();
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	96 IdentityHashMap<LogicNode, ValueNode> newFalseConditions = new IdentityHashMap<>();
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	97
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	98 HashSet<ValueNode> newKnownNull = new HashSet<>(knownNull);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	99 HashSet<ValueNode> newKnownNonNull = new HashSet<>(knownNonNull);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	100 for (State state : withStates) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	101 newKnownNull.retainAll(state.knownNull);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	102 newKnownNonNull.retainAll(state.knownNonNull);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	103 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	104
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	105 for (Map.Entry<ValueNode, ResolvedJavaType> entry : knownTypes.entrySet()) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	106 ValueNode node = entry.getKey();
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	107 ResolvedJavaType type = entry.getValue();
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	108
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	109 for (State other : withStates) {
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	110 ResolvedJavaType otherType = other.getNodeType(node);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	111 type = widen(type, otherType);
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	112 if (type == null) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	113 break;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	114 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	115 }
11265 ef6915cf1e59 Add illegal stamp Gilles Duboscq <duboscq@ssw.jku.at> parents: 10841 diff changeset	116 if (type != null && type != ObjectStamp.typeOrNull(node)) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	117 newKnownTypes.put(node, type);
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	118 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	119 }
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	120
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	121 for (Map.Entry<LogicNode, ValueNode> entry : trueConditions.entrySet()) {
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	122 LogicNode check = entry.getKey();
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	123 ValueNode guard = entry.getValue();
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	124
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	125 for (State other : withStates) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	126 ValueNode otherGuard = other.trueConditions.get(check);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	127 if (otherGuard == null) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	128 guard = null;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	129 break;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	130 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	131 if (otherGuard != guard) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	132 guard = merge;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	133 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	134 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	135 if (guard != null) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	136 newTrueConditions.put(check, guard);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	137 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	138 }
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	139 for (Map.Entry<LogicNode, ValueNode> entry : falseConditions.entrySet()) {
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	140 LogicNode check = entry.getKey();
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	141 ValueNode guard = entry.getValue();
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	142
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	143 for (State other : withStates) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	144 ValueNode otherGuard = other.falseConditions.get(check);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	145 if (otherGuard == null) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	146 guard = null;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	147 break;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	148 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	149 if (otherGuard != guard) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	150 guard = merge;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	151 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	152 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	153 if (guard != null) {
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	154 newFalseConditions.put(check, guard);
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	155 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	156 }
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	157
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	158 // this piece of code handles phis
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	159 if (!(merge instanceof LoopBeginNode)) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	160 for (PhiNode phi : merge.phis()) {
5774 a1db0ea58b53 Removed left over Ci* prefixed identifiers Doug Simon <doug.simon@oracle.com> parents: 5541 diff changeset	161 if (phi.type() == PhiType.Value && phi.kind() == Kind.Object) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	162 ValueNode firstValue = phi.valueAt(0);
5775 2c088af17e59 Removed left over Ri* prefixed identifiers Doug Simon <doug.simon@oracle.com> parents: 5774 diff changeset	163 ResolvedJavaType type = getNodeType(firstValue);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	164 boolean nonNull = knownNonNull.contains(firstValue);
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	165 boolean isNull = knownNull.contains(firstValue);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	166
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	167 for (int i = 0; i < withStates.size(); i++) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	168 State otherState = withStates.get(i);
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	169 ValueNode value = phi.valueAt(i + 1);
5775 2c088af17e59 Removed left over Ri* prefixed identifiers Doug Simon <doug.simon@oracle.com> parents: 5774 diff changeset	170 ResolvedJavaType otherType = otherState.getNodeType(value);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	171 type = widen(type, otherType);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	172 nonNull &= otherState.knownNonNull.contains(value);
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	173 isNull &= otherState.knownNull.contains(value);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	174 }
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	175 if (type != null) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	176 newKnownTypes.put(phi, type);
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	177 }
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	178 if (nonNull) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	179 newKnownNonNull.add(phi);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	180 }
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	181 if (isNull) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	182 newKnownNull.add(phi);
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	183 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	184 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	185 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	186 }
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	187
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	188 this.knownTypes = newKnownTypes;
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	189 this.knownNonNull = newKnownNonNull;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	190 this.knownNull = newKnownNull;
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	191 this.trueConditions = newTrueConditions;
0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	192 this.falseConditions = newFalseConditions;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	193 return true;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	194 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	195
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	196 public ResolvedJavaType getNodeType(ValueNode node) {
10767 88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	197 ResolvedJavaType result = knownTypes.get(GraphUtil.unproxify(node));
11265 ef6915cf1e59 Add illegal stamp Gilles Duboscq <duboscq@ssw.jku.at> parents: 10841 diff changeset	198 return result == null ? ObjectStamp.typeOrNull(node) : result;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	199 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	200
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	201 public boolean isNull(ValueNode value) {
11265 ef6915cf1e59 Add illegal stamp Gilles Duboscq <duboscq@ssw.jku.at> parents: 10841 diff changeset	202 return ObjectStamp.isObjectAlwaysNull(value) \|\| knownNull.contains(GraphUtil.unproxify(value));
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	203 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	204
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	205 public boolean isNonNull(ValueNode value) {
11265 ef6915cf1e59 Add illegal stamp Gilles Duboscq <duboscq@ssw.jku.at> parents: 10841 diff changeset	206 return ObjectStamp.isObjectNonNull(value) \|\| knownNonNull.contains(GraphUtil.unproxify(value));
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	207 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	208
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	209 @Override
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	210 public State clone() {
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	211 return new State(this);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	212 }
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	213
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	214 /**
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	215 * Adds information about a condition. If isTrue is true then the condition is known to
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	216 * hold, otherwise the condition is known not to hold.
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	217 */
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	218 public void addCondition(boolean isTrue, LogicNode condition, ValueNode anchor) {
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	219 if (isTrue) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	220 if (!trueConditions.containsKey(condition)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	221 trueConditions.put(condition, anchor);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	222 metricConditionRegistered.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	223 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	224 } else {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	225 if (!falseConditions.containsKey(condition)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	226 falseConditions.put(condition, anchor);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	227 metricConditionRegistered.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	228 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	229 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	230 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	231
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	232 /**
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	233 * Adds information about the nullness of a value. If isNull is true then the value is known
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	234 * to be null, otherwise the value is known to be non-null.
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	235 */
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	236 public void addNullness(boolean isNull, ValueNode value) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	237 if (isNull) {
10802 e6bb7edcc66c fix for ConditionalEliminationPhase.addNullness Lukas Stadler <lukas.stadler@jku.at> parents: 10790 diff changeset	238 if (!isNull(value)) {
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	239 metricNullnessRegistered.increment();
10802 e6bb7edcc66c fix for ConditionalEliminationPhase.addNullness Lukas Stadler <lukas.stadler@jku.at> parents: 10790 diff changeset	240 knownNull.add(GraphUtil.unproxify(value));
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	241 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	242 } else {
10802 e6bb7edcc66c fix for ConditionalEliminationPhase.addNullness Lukas Stadler <lukas.stadler@jku.at> parents: 10790 diff changeset	243 if (!isNonNull(value)) {
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	244 metricNullnessRegistered.increment();
10802 e6bb7edcc66c fix for ConditionalEliminationPhase.addNullness Lukas Stadler <lukas.stadler@jku.at> parents: 10790 diff changeset	245 knownNonNull.add(GraphUtil.unproxify(value));
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	246 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	247 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	248 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	249
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	250 public void addType(ResolvedJavaType type, ValueNode value) {
10767 88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	251 ValueNode original = GraphUtil.unproxify(value);
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	252 ResolvedJavaType knownType = getNodeType(original);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	253 ResolvedJavaType newType = tighten(type, knownType);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	254
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	255 if (newType != knownType) {
10767 88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	256 knownTypes.put(original, newType);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	257 metricTypeRegistered.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	258 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	259 }
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	260 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	261
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	262 public static ResolvedJavaType widen(ResolvedJavaType a, ResolvedJavaType b) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	263 if (a == null \|\| b == null) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	264 return null;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	265 } else if (a == b) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	266 return a;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	267 } else {
6539 2463eb24b644 Cleanup of Graal API: Rename methods so that it follows the getXxx naming convention and so that they are similar to the names of the java.lang.reflect classes. Remove unused methods. Christian Wimmer <christian.wimmer@oracle.com> parents: 6526 diff changeset	268 return a.findLeastCommonAncestor(b);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	269 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	270 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	271
5541 b4c406861c33 More renamings to drop Ri* prefix completely. Deleted graph.BitMap class and replaced with java.util.BitSet. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 5507 diff changeset	272 public static ResolvedJavaType tighten(ResolvedJavaType a, ResolvedJavaType b) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	273 if (a == null) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	274 return b;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	275 } else if (b == null) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	276 return a;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	277 } else if (a == b) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	278 return a;
7097 6644cecbd3a7 Replace ResolvedJavaType.isAssignableTo with isAssignableFrom to be consistent with java.lang.Class Christian Wimmer <christian.wimmer@oracle.com> parents: 7037 diff changeset	279 } else if (a.isAssignableFrom(b)) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	280 return b;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	281 } else {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	282 return a;
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	283 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	284 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	285
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	286 public class ConditionalElimination extends PostOrderNodeIterator<State> {
7530 5e3d1a68664e applied mx eclipseformat to all Java files Doug Simon <doug.simon@oracle.com> parents: 7257 diff changeset	287
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	288 private final LogicNode trueConstant;
4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	289 private final LogicNode falseConstant;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	290
6587 795df1687282 renamed CheckCastElimination to ConditionalElimination, plus a few small changes Lukas Stadler <lukas.stadler@jku.at> parents: 6564 diff changeset	291 public ConditionalElimination(FixedNode start, State initialState) {
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	292 super(start, initialState);
8389 e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	293 trueConstant = LogicConstantNode.tautology(graph);
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	294 falseConstant = LogicConstantNode.contradiction(graph);
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	295 }
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	296
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	297 @Override
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	298 public void finished() {
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	299 if (trueConstant.usages().isEmpty()) {
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	300 graph.removeFloating(trueConstant);
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	301 }
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	302 if (falseConstant.usages().isEmpty()) {
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	303 graph.removeFloating(falseConstant);
e53b31b29aa4 clean up unused true/false constants in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 7767 diff changeset	304 }
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	305 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	306
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	307 private void registerCondition(boolean isTrue, LogicNode condition, ValueNode anchor) {
10789 ec4c7c33e8e5 rename: LogicBinaryNode -> ShortCircuitBooleanNode, Logic[Conjunction\|Disjunction]Node -> ShortCircuit[And\|Or]Node Doug Simon <doug.simon@oracle.com> parents: 10767 diff changeset	308 if (!isTrue && condition instanceof ShortCircuitOrNode) {
ec4c7c33e8e5 rename: LogicBinaryNode -> ShortCircuitBooleanNode, Logic[Conjunction\|Disjunction]Node -> ShortCircuit[And\|Or]Node Doug Simon <doug.simon@oracle.com> parents: 10767 diff changeset	309 ShortCircuitOrNode disjunction = (ShortCircuitOrNode) condition;
10749 e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	310 registerCondition(disjunction.isXNegated(), disjunction.getX(), anchor);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	311 registerCondition(disjunction.isYNegated(), disjunction.getY(), anchor);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	312 } else {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	313 state.addCondition(isTrue, condition, anchor);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	314
10749 e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	315 if (isTrue && condition instanceof InstanceOfNode) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	316 InstanceOfNode instanceOf = (InstanceOfNode) condition;
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	317 ValueNode object = instanceOf.object();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	318 state.addNullness(false, object);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	319 state.addType(instanceOf.type(), object);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	320 } else if (condition instanceof IsNullNode) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	321 IsNullNode nullCheck = (IsNullNode) condition;
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	322 state.addNullness(isTrue, nullCheck.object());
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	323 } else if (condition instanceof ObjectEqualsNode) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	324 ObjectEqualsNode equals = (ObjectEqualsNode) condition;
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	325 ValueNode x = equals.x();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	326 ValueNode y = equals.y();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	327 if (isTrue) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	328 if (state.isNull(x) && !state.isNull(y)) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	329 metricObjectEqualsRegistered.increment();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	330 state.addNullness(true, y);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	331 } else if (!state.isNull(x) && state.isNull(y)) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	332 metricObjectEqualsRegistered.increment();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	333 state.addNullness(true, x);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	334 }
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	335 if (state.isNonNull(x) && !state.isNonNull(y)) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	336 metricObjectEqualsRegistered.increment();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	337 state.addNullness(false, y);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	338 } else if (!state.isNonNull(x) && state.isNonNull(y)) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	339 metricObjectEqualsRegistered.increment();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	340 state.addNullness(false, x);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	341 }
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	342 } else {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	343 if (state.isNull(x) && !state.isNonNull(y)) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	344 metricObjectEqualsRegistered.increment();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	345 state.addNullness(false, y);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	346 } else if (!state.isNonNull(x) && state.isNull(y)) {
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	347 metricObjectEqualsRegistered.increment();
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	348 state.addNullness(false, x);
e7c0658c2f25 record disjunctive conditions in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10748 diff changeset	349 }
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	350 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	351 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	352 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	353 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	354
9436 ae815a4c112a Rename BeginNode => AbstractBeginNode and make abstract. Introduce concrete subclass BeginNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9434 diff changeset	355 private void registerControlSplitInfo(Node pred, AbstractBeginNode begin) {
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	356 assert pred != null && begin != null;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	357
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	358 if (pred instanceof IfNode) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	359 IfNode ifNode = (IfNode) pred;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	360
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	361 if (!(ifNode.condition() instanceof LogicConstantNode)) {
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	362 registerCondition(begin == ifNode.trueSuccessor(), ifNode.condition(), begin);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	363 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	364 } else if (pred instanceof TypeSwitchNode) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	365 TypeSwitchNode typeSwitch = (TypeSwitchNode) pred;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	366
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	367 if (typeSwitch.value() instanceof LoadHubNode) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	368 LoadHubNode loadHub = (LoadHubNode) typeSwitch.value();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	369 ResolvedJavaType type = null;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	370 for (int i = 0; i < typeSwitch.keyCount(); i++) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	371 if (typeSwitch.keySuccessor(i) == begin) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	372 if (type == null) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	373 type = typeSwitch.typeAt(i);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	374 } else {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	375 type = widen(type, typeSwitch.typeAt(i));
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	376 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	377 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	378 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	379 if (type != null) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	380 state.addNullness(false, loadHub.object());
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	381 state.addType(type, loadHub.object());
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	382 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	383 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	384 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	385 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	386
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	387 private void registerGuard(GuardNode guard) {
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	388 LogicNode condition = guard.condition();
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	389
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	390 ValueNode existingGuards = guard.negated() ? state.falseConditions.get(condition) : state.trueConditions.get(condition);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	391 if (existingGuards != null) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	392 guard.replaceAtUsages(existingGuards);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	393 GraphUtil.killWithUnusedFloatingInputs(guard);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	394 metricGuardsRemoved.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	395 } else {
10720 7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	396 ValueNode anchor = state.trueConditions.get(condition);
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	397 if (anchor != null) {
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	398 if (!guard.negated()) {
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	399 guard.replaceAtUsages(anchor);
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	400 metricGuardsRemoved.increment();
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	401 GraphUtil.killWithUnusedFloatingInputs(guard);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	402 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	403 } else {
10720 7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	404 anchor = state.falseConditions.get(condition);
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	405 if (anchor != null) {
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	406 if (guard.negated()) {
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	407 guard.replaceAtUsages(anchor);
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	408 metricGuardsRemoved.increment();
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	409 GraphUtil.killWithUnusedFloatingInputs(guard);
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	410 }
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	411 } else {
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	412 registerCondition(!guard.negated(), condition, guard);
7cc08d83111d correctly anchor eliminated guards during ConditionalElimination Lukas Stadler <lukas.stadler@jku.at> parents: 10532 diff changeset	413 }
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	414 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	415 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	416 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	417
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	418 /**
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	419 * Determines if, at the current point in the control flow, the condition is known to be
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	420 * true, false or unknown. In case of true or false the corresponding value is returned,
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	421 * otherwise null.
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	422 */
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	423 private <T extends ValueNode> T evaluateCondition(LogicNode condition, T trueValue, T falseValue) {
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	424 if (state.trueConditions.containsKey(condition)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	425 return trueValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	426 } else if (state.falseConditions.containsKey(condition)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	427 return falseValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	428 } else {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	429 if (condition instanceof InstanceOfNode) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	430 InstanceOfNode instanceOf = (InstanceOfNode) condition;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	431 ValueNode object = instanceOf.object();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	432 if (state.isNull(object)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	433 metricInstanceOfRemoved.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	434 return falseValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	435 } else if (state.isNonNull(object)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	436 ResolvedJavaType type = state.getNodeType(object);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	437 if (type != null && instanceOf.type().isAssignableFrom(type)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	438 metricInstanceOfRemoved.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	439 return trueValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	440 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	441 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	442 } else if (condition instanceof IsNullNode) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	443 IsNullNode isNull = (IsNullNode) condition;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	444 ValueNode object = isNull.object();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	445 if (state.isNull(object)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	446 metricNullCheckRemoved.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	447 return trueValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	448 } else if (state.isNonNull(object)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	449 metricNullCheckRemoved.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	450 return falseValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	451 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	452 } else if (condition instanceof ObjectEqualsNode) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	453 ObjectEqualsNode equals = (ObjectEqualsNode) condition;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	454 ValueNode x = equals.x();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	455 ValueNode y = equals.y();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	456 if (state.isNull(x) && state.isNonNull(y) \|\| state.isNonNull(x) && state.isNull(y)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	457 metricObjectEqualsRemoved.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	458 return falseValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	459 } else if (state.isNull(x) && state.isNull(y)) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	460 metricObjectEqualsRemoved.increment();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	461 return trueValue;
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	462 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	463 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	464 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	465 return null;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	466 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	467
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	468 @Override
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	469 protected void node(FixedNode node) {
9436 ae815a4c112a Rename BeginNode => AbstractBeginNode and make abstract. Introduce concrete subclass BeginNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9434 diff changeset	470 if (node instanceof AbstractBeginNode) {
ae815a4c112a Rename BeginNode => AbstractBeginNode and make abstract. Introduce concrete subclass BeginNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 9434 diff changeset	471 AbstractBeginNode begin = (AbstractBeginNode) node;
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	472 Node pred = node.predecessor();
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	473
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	474 if (pred != null) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	475 registerControlSplitInfo(pred, begin);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	476 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	477 for (GuardNode guard : begin.guards().snapshot()) {
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	478 registerGuard(guard);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	479 }
10781 c53544484645 process FixedGuardNodes in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10767 diff changeset	480 } else if (node instanceof FixedGuardNode) {
c53544484645 process FixedGuardNodes in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10767 diff changeset	481 FixedGuardNode guard = (FixedGuardNode) node;
c53544484645 process FixedGuardNodes in ConditionalEliminationPhase Lukas Stadler <lukas.stadler@jku.at> parents: 10767 diff changeset	482 registerCondition(!guard.isNegated(), guard.condition(), guard);
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	483 } else if (node instanceof CheckCastNode) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	484 CheckCastNode checkCast = (CheckCastNode) node;
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	485 ValueNode object = checkCast.object();
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	486 boolean isNull = state.isNull(object);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	487 ResolvedJavaType type = state.getNodeType(object);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	488 if (isNull \|\| (type != null && checkCast.type().isAssignableFrom(type))) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	489 boolean nonNull = state.isNonNull(object);
11305 edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	490 GuardingNode replacementAnchor = null;
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	491 if (nonNull) {
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	492 // Search for valid instanceof anchor.
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	493 for (InstanceOfNode instanceOfNode : object.usages().filter(InstanceOfNode.class)) {
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	494 if (instanceOfNode.type() == checkCast.type() && state.trueConditions.containsKey(instanceOfNode)) {
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	495 ValueNode v = state.trueConditions.get(instanceOfNode);
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	496 if (v instanceof GuardingNode) {
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	497 replacementAnchor = (GuardingNode) v;
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	498 }
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	499 }
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	500 }
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	501 }
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	502 ValueAnchorNode anchor = null;
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	503 if (replacementAnchor == null) {
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	504 anchor = graph.add(new ValueAnchorNode());
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	505 replacementAnchor = anchor;
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	506 }
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	507 PiNode piNode;
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	508 if (isNull) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	509 ConstantNode nullObject = ConstantNode.forObject(null, metaAccessProvider, graph);
11305 edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	510 piNode = graph.unique(new PiNode(nullObject, StampFactory.forConstant(nullObject.value, metaAccessProvider), replacementAnchor));
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	511 } else {
11305 edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	512 piNode = graph.unique(new PiNode(object, StampFactory.declared(type, nonNull), replacementAnchor));
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	513 }
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	514 checkCast.replaceAtUsages(piNode);
11305 edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	515 if (anchor != null) {
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	516 graph.replaceFixedWithFixed(checkCast, anchor);
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	517 } else {
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	518 graph.removeFixed(checkCast);
edf7e09ad382 Search for correct replacement anchor for eliminated checkcasts in ConditionalEliminationPhase. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11298 diff changeset	519 }
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	520 metricCheckCastRemoved.increment();
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	521 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	522 } else if (node instanceof IfNode) {
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	523 IfNode ifNode = (IfNode) node;
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	524 LogicNode compare = ifNode.condition();
10532 1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	525
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	526 LogicNode replacement = null;
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	527 ValueNode replacementAnchor = null;
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	528 AbstractBeginNode survivingSuccessor = null;
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	529 if (state.trueConditions.containsKey(compare)) {
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	530 replacement = trueConstant;
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	531 replacementAnchor = state.trueConditions.get(compare);
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	532 survivingSuccessor = ifNode.trueSuccessor();
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	533 } else if (state.falseConditions.containsKey(compare)) {
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	534 replacement = falseConstant;
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	535 replacementAnchor = state.falseConditions.get(compare);
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	536 survivingSuccessor = ifNode.falseSuccessor();
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	537 } else {
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	538 replacement = evaluateCondition(compare, trueConstant, falseConstant);
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	539 if (replacement != null) {
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	540 if (replacement == trueConstant) {
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	541 survivingSuccessor = ifNode.trueSuccessor();
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	542 } else {
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	543 assert replacement == falseConstant;
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	544 survivingSuccessor = ifNode.falseSuccessor();
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	545 }
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	546 }
1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	547 }
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	548
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	549 if (replacement != null) {
11309 2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	550 for (Node n : survivingSuccessor.usages().snapshot()) {
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	551 if (n instanceof GuardNode \|\| n instanceof ProxyNode) {
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	552 // Keep wired to the begin node.
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	553 } else {
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	554 if (replacementAnchor == null) {
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	555 // Cannot simplify this IfNode as there is no anchor.
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	556 return;
10532 1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	557 }
11309 2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	558
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	559 // Rewire to the replacement anchor.
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	560 n.replaceFirstInput(survivingSuccessor, replacementAnchor);
10532 1194e94f9c16 fixed bug in ConditionalEliminationPhase (GRAAL-346) Doug Simon <doug.simon@oracle.com> parents: 9436 diff changeset	561 }
11309 2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	562 }
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	563
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	564 ifNode.setCondition(replacement);
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	565 if (compare.usages().isEmpty()) {
2f216d44bce4 Fix anchoring in ConditionalEliminationPhase when simplifying an IfNode. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 11305 diff changeset	566 GraphUtil.killWithUnusedFloatingInputs(compare);
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	567 }
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	568 }
9434 50f02c7d1cec Rename EndNode => AbstractEndNode and make abstract class. Introduce concrete EndNode subclass. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 8649 diff changeset	569 } else if (node instanceof AbstractEndNode) {
50f02c7d1cec Rename EndNode => AbstractEndNode and make abstract class. Introduce concrete EndNode subclass. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 8649 diff changeset	570 AbstractEndNode endNode = (AbstractEndNode) node;
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	571 for (PhiNode phi : endNode.merge().phis()) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	572 int index = endNode.merge().phiPredecessorIndex(endNode);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	573 ValueNode value = phi.valueAt(index);
7724 ac3579b4adc9 remove MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7706 diff changeset	574 if (value instanceof ConditionalNode) {
ac3579b4adc9 remove MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7706 diff changeset	575 ConditionalNode materialize = (ConditionalNode) value;
7767 4a6646d8eb87 separate BooleanNode and ConstantNode hierarchy, rename BooleanNode to LogicNode and LogicNode to BitLogicNode Lukas Stadler <lukas.stadler@jku.at> parents: 7724 diff changeset	576 LogicNode compare = materialize.condition();
7706 9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	577 ValueNode replacement = evaluateCondition(compare, materialize.trueValue(), materialize.falseValue());
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	578
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	579 if (replacement != null) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	580 phi.setValueAt(index, replacement);
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	581 if (materialize.usages().isEmpty()) {
9ea26951d826 fix TypeSystemTest, cleanup of ConditionalEliminationPhase, handle ObjectEqualsNode and MaterializeNode Lukas Stadler <lukas.stadler@jku.at> parents: 7530 diff changeset	582 GraphUtil.killWithUnusedFloatingInputs(materialize);
5425 0364a2a874b8 changes towards a canonical representation of comparisons: Lukas Stadler <lukas.stadler@jku.at> parents: 5393 diff changeset	583 }
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	584 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	585 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	586 }
10767 88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	587 } else if (node instanceof Invoke) {
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	588 Invoke invoke = (Invoke) node;
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	589 if (invoke.callTarget() instanceof MethodCallTargetNode) {
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	590 MethodCallTargetNode callTarget = (MethodCallTargetNode) invoke.callTarget();
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	591 ValueNode receiver = callTarget.receiver();
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	592 if (receiver != null && (callTarget.invokeKind() == InvokeKind.Interface \|\| callTarget.invokeKind() == InvokeKind.Virtual)) {
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	593 ResolvedJavaType type = state.getNodeType(receiver);
11265 ef6915cf1e59 Add illegal stamp Gilles Duboscq <duboscq@ssw.jku.at> parents: 10841 diff changeset	594 if (type != ObjectStamp.typeOrNull(receiver)) {
10767 88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	595 ResolvedJavaMethod method = type.resolveMethod(callTarget.targetMethod());
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	596 if (method != null) {
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	597 if ((method.getModifiers() & Modifier.FINAL) != 0 \|\| (type.getModifiers() & Modifier.FINAL) != 0) {
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	598 callTarget.setInvokeKind(InvokeKind.Special);
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	599 callTarget.setTargetMethod(method);
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	600 }
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	601 }
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	602 }
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	603 }
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	604 }
88d0dc388450 let ConditionalEliminationPhase change invokes to InvokeKind.Special based on type information Lukas Stadler <lukas.stadler@jku.at> parents: 10749 diff changeset	605
5391 5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	606 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	607 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	608 }
5097f21f6c2b add a new simple CheckCast elimination phase Lukas Stadler <lukas.stadler@jku.at> parents: diff changeset	609 }

Mercurial > hg > truffle

annotate graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java @ 11310:9f317a663366