comparison graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java @ 19306:a0a760b0fb5f

pulled method evolution dependencies out of Assumptions and directly into StructuredGraph
author Doug Simon <doug.simon@oracle.com>
date Thu, 12 Feb 2015 01:54:05 +0100
parents 6bef14568a54
children 61d3cb8e1280
comparison
equal deleted inserted replaced
19305:48bdad77afcd 19306:a0a760b0fb5f
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 */ 22 */
23 package com.oracle.graal.hotspot.test; 23 package com.oracle.graal.hotspot.test;
24 24
25 import static com.oracle.graal.api.code.Assumptions.*;
26 import static com.oracle.graal.api.code.CodeUtil.*; 25 import static com.oracle.graal.api.code.CodeUtil.*;
27 import static com.oracle.graal.compiler.GraalCompiler.*; 26 import static com.oracle.graal.compiler.GraalCompiler.*;
28 import static com.oracle.graal.compiler.common.GraalOptions.*; 27 import static com.oracle.graal.compiler.common.GraalOptions.*;
29 import static com.oracle.graal.nodes.ConstantNode.*; 28 import static com.oracle.graal.nodes.ConstantNode.*;
30 29
40 import com.oracle.graal.hotspot.meta.*; 39 import com.oracle.graal.hotspot.meta.*;
41 import com.oracle.graal.hotspot.nodes.type.*; 40 import com.oracle.graal.hotspot.nodes.type.*;
42 import com.oracle.graal.lir.asm.*; 41 import com.oracle.graal.lir.asm.*;
43 import com.oracle.graal.lir.phases.*; 42 import com.oracle.graal.lir.phases.*;
44 import com.oracle.graal.nodes.*; 43 import com.oracle.graal.nodes.*;
44 import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions;
45 import com.oracle.graal.nodes.extended.*; 45 import com.oracle.graal.nodes.extended.*;
46 import com.oracle.graal.options.*; 46 import com.oracle.graal.options.*;
47 import com.oracle.graal.options.OptionValue.OverrideScope; 47 import com.oracle.graal.options.OptionValue.OverrideScope;
48 import com.oracle.graal.phases.*; 48 import com.oracle.graal.phases.*;
49 import com.oracle.graal.phases.tiers.*; 49 import com.oracle.graal.phases.tiers.*;
203 HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) constant.asConstant(); 203 HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) constant.asConstant();
204 Assert.assertTrue(c.isEqualTo(Boolean.TRUE)); 204 Assert.assertTrue(c.isEqualTo(Boolean.TRUE));
205 } 205 }
206 206
207 private StructuredGraph compile(String test, boolean compileAOT) { 207 private StructuredGraph compile(String test, boolean compileAOT) {
208 StructuredGraph graph = parseEager(test, ALLOW_OPTIMISTIC_ASSUMPTIONS); 208 StructuredGraph graph = parseEager(test, AllowAssumptions.YES);
209 ResolvedJavaMethod method = graph.method(); 209 ResolvedJavaMethod method = graph.method();
210 210
211 try (OverrideScope s = OptionValue.override(ImmutableCode, compileAOT)) { 211 try (OverrideScope s = OptionValue.override(ImmutableCode, compileAOT)) {
212 CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graph.method(), false); 212 CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graph.method(), false);
213 // create suites everytime, as we modify options for the compiler 213 // create suites everytime, as we modify options for the compiler