# HG changeset patch # User Bernhard Urban # Date 1371024766 -7200 # Node ID c4a0e878868f186b5c5f13dd95177b6562bcb20e # Parent e23b0486e75058336a784e67d845d0dc45d1fcef class constants: add hotspot specific phase to load java mirror via klass* (GRAAL-290) diff -r e23b0486e750 -r c4a0e878868f graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java --- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Jun 12 10:12:38 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Jun 12 10:12:46 2013 +0200 @@ -33,6 +33,9 @@ import com.oracle.graal.api.runtime.*; import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.test.*; +import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.hotspot.meta.*; +import com.oracle.graal.hotspot.phases.*; import com.oracle.graal.java.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; @@ -58,17 +61,48 @@ } @Test - public void testStaticFinalObject1() { - StructuredGraph result2 = compile("getStaticFinalObject", true); - assert result2.getNodes().filter(ConstantNode.class).count() == 1; - assert result2.getNodes(FloatingReadNode.class).count() == 1; + public void testStaticFinalObjectAOT() { + StructuredGraph result = compile("getStaticFinalObject", true); + assert result.getNodes().filter(ConstantNode.class).count() == 1; + assert result.getNodes(FloatingReadNode.class).count() == 2; + } + + @Test + public void testStaticFinalObject() { + StructuredGraph result = compile("getStaticFinalObject", false); + assert result.getNodes().filter(ConstantNode.class).count() == 1; + assert result.getNodes(FloatingReadNode.class).count() == 0; + } + + public static Class getClassObject() { + return AheadOfTimeCompilationTest.class; } @Test - public void testStaticFinalObject2() { - StructuredGraph result1 = compile("getStaticFinalObject", false); - assert result1.getNodes().filter(ConstantNode.class).count() == 1; - assert result1.getNodes(FloatingReadNode.class).count() == 0; + public void testClassObjectAOT() { + StructuredGraph result = compile("getClassObject", true); + + NodeIterable filter = result.getNodes().filter(ConstantNode.class); + assert filter.count() == 1; + HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) runtime.lookupJavaType(AheadOfTimeCompilationTest.class); + assert filter.first().asConstant().equals(type.klass()); + + assert result.getNodes(FloatingReadNode.class).count() == 1; + assert result.getNodes(ReadNode.class).count() == 0; + } + + @Test + public void testClassObject() { + StructuredGraph result = compile("getClassObject", false); + + NodeIterable filter = result.getNodes().filter(ConstantNode.class); + assert filter.count() == 1; + Object mirror = filter.first().asConstant().asObject(); + assert mirror.getClass().equals(Class.class); + assert mirror.equals(AheadOfTimeCompilationTest.class); + + assert result.getNodes(FloatingReadNode.class).count() == 0; + assert result.getNodes(ReadNode.class).count() == 0; } private StructuredGraph compile(String test, boolean compileAOT) { @@ -85,6 +119,9 @@ CallingConvention cc = getCallingConvention(runtime, Type.JavaCallee, graph.method(), false); // create suites everytime, as we modify options for the compiler final Suites suitesLocal = Graal.getRequiredCapability(SuitesProvider.class).createSuites(); + if (compileAOT) { + suitesLocal.getHighTier().addPhase(new LoadJavaMirrorWithKlassPhase()); + } final CompilationResult compResult = GraalCompiler.compileGraph(graph, cc, method, runtime, replacements, backend, runtime().getTarget(), null, phasePlan, OptimisticOptimizations.ALL, new SpeculationLog(), suitesLocal); addMethod(method, compResult, graphCopy); diff -r e23b0486e750 -r c4a0e878868f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java Wed Jun 12 10:12:46 2013 +0200 @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2013, 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.hotspot.phases; + +import static com.oracle.graal.api.meta.LocationIdentity.*; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.hotspot.meta.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.HeapAccess.WriteBarrierType; +import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.nodes.type.*; +import com.oracle.graal.phases.*; +import com.oracle.graal.phases.tiers.*; + +public class LoadJavaMirrorWithKlassPhase extends BasePhase { + + @Override + protected void run(StructuredGraph graph, PhaseContext context) { + for (ConstantNode node : graph.getNodes().filter(ConstantNode.class)) { + Constant constant = node.asConstant(); + if (constant.getKind() == Kind.Object && constant.asObject() instanceof Class) { + ResolvedJavaType type = context.getRuntime().lookupJavaType((Class) constant.asObject()); + if (type instanceof HotSpotResolvedObjectType) { + HotSpotRuntime runtime = (HotSpotRuntime) context.getRuntime(); + + Constant klass = ((HotSpotResolvedObjectType) type).klass(); + ConstantNode klassNode = ConstantNode.forConstant(klass, runtime, graph); + + Stamp stamp = StampFactory.exactNonNull(runtime.lookupJavaType(Class.class)); + LocationNode location = graph.unique(ConstantLocationNode.create(FINAL_LOCATION, stamp.kind(), runtime.config.classMirrorOffset, graph)); + ReadNode readNode = graph.add(new ReadNode(klassNode, location, stamp, WriteBarrierType.NONE, false)); + + FixedNode afterStart = graph.start().next(); + graph.start().setNext(readNode); + readNode.setNext(afterStart); + + graph.replaceFloating(node, readNode); + } + } + } + } +}