--- /dev/null 2016-05-31 09:42:47.975716356 -0700 +++ new/src/jdk.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java 2016-12-09 00:57:26.890364337 -0800 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2011, 2016, 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 org.graalvm.compiler.virtual.phases.ea; + +import static org.graalvm.compiler.core.common.GraalOptions.EscapeAnalysisIterations; +import static org.graalvm.compiler.core.common.GraalOptions.EscapeAnalyzeOnly; + +import java.util.Set; + +import org.graalvm.compiler.graph.Node; +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; +import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; +import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; +import org.graalvm.compiler.options.Option; +import org.graalvm.compiler.options.OptionType; +import org.graalvm.compiler.options.OptionValue; +import org.graalvm.compiler.phases.BasePhase; +import org.graalvm.compiler.phases.common.CanonicalizerPhase; +import org.graalvm.compiler.phases.tiers.PhaseContext; + +public class PartialEscapePhase extends EffectsPhase { + + static class Options { + //@formatter:off + @Option(help = "", type = OptionType.Debug) + public static final OptionValue OptEarlyReadElimination = new OptionValue<>(true); + //@formatter:on + } + + private final boolean readElimination; + private final BasePhase cleanupPhase; + + public PartialEscapePhase(boolean iterative, CanonicalizerPhase canonicalizer) { + this(iterative, Options.OptEarlyReadElimination.getValue(), canonicalizer, null); + } + + public PartialEscapePhase(boolean iterative, CanonicalizerPhase canonicalizer, BasePhase cleanupPhase) { + this(iterative, Options.OptEarlyReadElimination.getValue(), canonicalizer, cleanupPhase); + } + + public PartialEscapePhase(boolean iterative, boolean readElimination, CanonicalizerPhase canonicalizer, BasePhase cleanupPhase) { + super(iterative ? EscapeAnalysisIterations.getValue() : 1, canonicalizer); + this.readElimination = readElimination; + this.cleanupPhase = cleanupPhase; + } + + @Override + protected void postIteration(StructuredGraph graph, PhaseContext context, Set changedNodes) { + super.postIteration(graph, context, changedNodes); + if (cleanupPhase != null) { + cleanupPhase.apply(graph, context); + } + } + + @Override + protected void run(StructuredGraph graph, PhaseContext context) { + if (VirtualUtil.matches(graph, EscapeAnalyzeOnly.getValue())) { + if (readElimination || graph.hasVirtualizableAllocation()) { + runAnalysis(graph, context); + } + } + } + + @Override + protected Closure createEffectsClosure(PhaseContext context, ScheduleResult schedule, ControlFlowGraph cfg) { + for (VirtualObjectNode virtual : cfg.graph.getNodes(VirtualObjectNode.TYPE)) { + virtual.resetObjectId(); + } + assert schedule != null; + if (readElimination) { + return new PEReadEliminationClosure(schedule, context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), context.getLowerer()); + } else { + return new PartialEscapeClosure.Final(schedule, context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), context.getLowerer()); + } + } + + @Override + public boolean checkContract() { + return false; + } + +}