Mercurial > hg > truffle
changeset 19682:7e429c4c3bfc
Remove LIRFrameState.finish() (and FinishFrameStatePhase).
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Tue, 03 Mar 2015 15:01:11 +0100 |
parents | 25e5614ae73c |
children | 787e9bd5966e |
files | graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/FinishFrameStatePhase.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationStage.java |
diffstat | 3 files changed, 0 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java Tue Mar 03 14:55:06 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java Tue Mar 03 15:01:11 2015 +0100 @@ -140,15 +140,6 @@ debugInfo.getReferenceMap().updateUnion(refMap); } - /** - * Called by the register allocator after all locations are marked. - * - * @param op The instruction to which this frame state belongs. - * @param frameMap The frame map. - */ - public void finish(LIRInstruction op, FrameMap frameMap) { - } - @Override public String toString() { return debugInfo != null ? debugInfo.toString() : topFrame != null ? topFrame.toString() : "<empty>";
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/FinishFrameStatePhase.java Tue Mar 03 14:55:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2015, 2015, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.lir.alloc.lsra; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; - -public class FinishFrameStatePhase extends AllocationPhase { - - @Override - protected <B extends AbstractBlockBase<B>> void run(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, SpillMoveFactory spillMoveFactory) { - LIR lir = lirGenRes.getLIR(); - FrameMap frameMap = lirGenRes.getFrameMap(); - // finish states - for (AbstractBlockBase<?> block : lir.getControlFlowGraph().getBlocks()) { - List<LIRInstruction> instructions = lir.getLIRforBlock(block); - for (int i = instructions.size() - 1; i >= 0; i--) { - LIRInstruction inst = instructions.get(i); - inst.forEachState((op, info) -> info.finish(op, frameMap)); - } - - } - } - -}
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationStage.java Tue Mar 03 14:55:06 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationStage.java Tue Mar 03 15:01:11 2015 +0100 @@ -38,7 +38,5 @@ } // currently we mark locations only if we do register allocation appendPhase(new LocationMarker()); - // finish states - this.findPhase(LocationMarker.class).add(new FinishFrameStatePhase()); } }