comparison graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.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 8ab925a6f724
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.compiler.test.ea; 23 package com.oracle.graal.compiler.test.ea;
24 24
25 import static com.oracle.graal.api.code.Assumptions.*;
26
27 import java.util.*; 25 import java.util.*;
28 26
29 import org.junit.*; 27 import org.junit.*;
30 28
31 import com.oracle.graal.api.meta.*; 29 import com.oracle.graal.api.meta.*;
32 import com.oracle.graal.compiler.test.*; 30 import com.oracle.graal.compiler.test.*;
33 import com.oracle.graal.debug.*; 31 import com.oracle.graal.debug.*;
34 import com.oracle.graal.debug.Debug.Scope; 32 import com.oracle.graal.debug.Debug.Scope;
35 import com.oracle.graal.java.*; 33 import com.oracle.graal.java.*;
36 import com.oracle.graal.nodes.*; 34 import com.oracle.graal.nodes.*;
35 import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions;
37 import com.oracle.graal.nodes.java.*; 36 import com.oracle.graal.nodes.java.*;
38 import com.oracle.graal.nodes.virtual.*; 37 import com.oracle.graal.nodes.virtual.*;
39 import com.oracle.graal.phases.*; 38 import com.oracle.graal.phases.*;
40 import com.oracle.graal.phases.common.*; 39 import com.oracle.graal.phases.common.*;
41 import com.oracle.graal.phases.common.inlining.*; 40 import com.oracle.graal.phases.common.inlining.*;
148 Assert.assertEquals(0, newInstanceCount); 147 Assert.assertEquals(0, newInstanceCount);
149 } 148 }
150 149
151 protected void prepareGraph(String snippet, final boolean iterativeEscapeAnalysis) { 150 protected void prepareGraph(String snippet, final boolean iterativeEscapeAnalysis) {
152 ResolvedJavaMethod method = getResolvedJavaMethod(snippet); 151 ResolvedJavaMethod method = getResolvedJavaMethod(snippet);
153 graph = new StructuredGraph(method, DONT_ALLOW_OPTIMISTIC_ASSUMPTIONS); 152 graph = new StructuredGraph(method, AllowAssumptions.NO);
154 try (Scope s = Debug.scope(getClass(), graph, method, getCodeCache())) { 153 try (Scope s = Debug.scope(getClass(), graph, method, getCodeCache())) {
155 new GraphBuilderPhase.Instance(getMetaAccess(), getProviders().getStampProvider(), getProviders().getConstantReflection(), GraphBuilderConfiguration.getEagerDefault(), 154 new GraphBuilderPhase.Instance(getMetaAccess(), getProviders().getStampProvider(), getProviders().getConstantReflection(), GraphBuilderConfiguration.getEagerDefault(),
156 OptimisticOptimizations.ALL).apply(graph); 155 OptimisticOptimizations.ALL).apply(graph);
157 context = new HighTierContext(getProviders(), null, getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL); 156 context = new HighTierContext(getProviders(), null, getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL);
158 new InliningPhase(new CanonicalizerPhase(true)).apply(graph, context); 157 new InliningPhase(new CanonicalizerPhase(true)).apply(graph, context);