Mercurial > hg > truffle
changeset 16246:0815ca9d7747
move removeIfUnused from CanonicalizerTool to SimplifierTool
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Thu, 26 Jun 2014 16:27:35 +0200 |
parents | 38fab08a3d9d |
children | b35b25c68387 |
files | graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/CanonicalizerTool.java graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/SimplifierTool.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/BaseReduction.java |
diffstat | 3 files changed, 10 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/CanonicalizerTool.java Thu Jun 26 17:40:03 2014 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/CanonicalizerTool.java Thu Jun 26 16:27:35 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.graph.*; public interface CanonicalizerTool { @@ -35,6 +34,4 @@ ConstantReflectionProvider getConstantReflection(); boolean canonicalizeReads(); - - void removeIfUnused(Node node); }
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/SimplifierTool.java Thu Jun 26 17:40:03 2014 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/SimplifierTool.java Thu Jun 26 16:27:35 2014 +0200 @@ -37,4 +37,6 @@ void addToWorkList(Node node); void addToWorkList(Iterable<? extends Node> nodes); + + void removeIfUnused(Node node); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/BaseReduction.java Thu Jun 26 17:40:03 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/BaseReduction.java Thu Jun 26 16:27:35 2014 +0200 @@ -22,18 +22,16 @@ */ package com.oracle.graal.phases.common.cfs; -import com.oracle.graal.api.code.Assumptions; +import java.util.*; + +import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.debug.Debug; -import com.oracle.graal.debug.DebugMetric; -import com.oracle.graal.graph.Node; +import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.debug.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.compiler.common.type.ObjectStamp; -import com.oracle.graal.phases.graph.SinglePassNodeIterator; -import com.oracle.graal.phases.tiers.PhaseContext; - -import java.util.ArrayList; +import com.oracle.graal.phases.graph.*; +import com.oracle.graal.phases.tiers.*; /** * <p> @@ -167,16 +165,6 @@ return context.getConstantReflection(); } - /** - * Postpone - * {@link com.oracle.graal.nodes.util.GraphUtil#tryKillUnused(com.oracle.graal.graph.Node)} - * until {@link FlowSensitiveReduction#finished()} for the reasons covered there. - */ - @Override - public void removeIfUnused(Node node) { - // GraphUtil.tryKillUnused(node); - } - @Override public boolean canonicalizeReads() { return false;