*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java	Mon Mar 20 17:37:28 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java	Mon Mar 20 17:37:28 2017

*** 23,36 ****
--- 23,32 ----
  package org.graalvm.compiler.core.test;
  
  import static org.graalvm.compiler.core.GraalCompiler.compileGraph;
  import static org.graalvm.compiler.core.common.GraalOptions.OptAssumptions;
  import static org.junit.Assert.assertNotNull;
  import jdk.vm.ci.code.site.Call;
  import jdk.vm.ci.code.site.Infopoint;
  import jdk.vm.ci.code.site.InfopointReason;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  import org.junit.Test;
  
  import org.graalvm.compiler.code.CompilationResult;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;

*** 40,49 ****
--- 36,50 ----
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  
+ import jdk.vm.ci.code.site.Call;
+ import jdk.vm.ci.code.site.Infopoint;
+ import jdk.vm.ci.code.site.InfopointReason;
+ import jdk.vm.ci.meta.ResolvedJavaMethod;
+ 
  /**
   * Test that infopoints in {@link CompilationResult}s have correctly assigned reasons.
   */
  public class InfopointReasonTest extends GraalCompilerTest {
  

*** 61,71 ****
--- 62,72 ----
      @Test
      public void callInfopoints() {
          final ResolvedJavaMethod method = getResolvedJavaMethod("testMethod");
          final StructuredGraph graph = parseEager(method, AllowAssumptions.YES);
          final CompilationResult cr = compileGraph(graph, graph.method(), getProviders(), getBackend(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL, graph.getProfilingInfo(),
!                         getSuites(), getLIRSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default);
!                         createSuites(graph.getOptions()), createLIRSuites(graph.getOptions()), new CompilationResult(), CompilationResultBuilderFactory.Default);
          for (Infopoint sp : cr.getInfopoints()) {
              assertNotNull(sp.reason);
              if (sp instanceof Call) {
                  assertDeepEquals(InfopointReason.CALL, sp.reason);
              }

*** 73,93 ****
--- 74,94 ----
      }
  
      @Test
      public void lineInfopoints() {
          final ResolvedJavaMethod method = getResolvedJavaMethod("testMethod");
!         final StructuredGraph graph = parseDebug(method, AllowAssumptions.from(OptAssumptions.getValue()));
!         final StructuredGraph graph = parseDebug(method, AllowAssumptions.ifTrue(OptAssumptions.getValue(getInitialOptions())));
          int graphLineSPs = 0;
          for (FullInfopointNode ipn : graph.getNodes().filter(FullInfopointNode.class)) {
              if (ipn.getReason() == InfopointReason.BYTECODE_POSITION) {
                  ++graphLineSPs;
              }
          }
          assertTrue(graphLineSPs > 0);
          PhaseSuite<HighTierContext> graphBuilderSuite = getCustomGraphBuilderSuite(GraphBuilderConfiguration.getDefault(getDefaultGraphBuilderPlugins()).withFullInfopoints(true));
-         final CompilationResult cr = compileGraph(graph, graph.method(), getProviders(), getBackend(), graphBuilderSuite, OptimisticOptimizations.ALL, graph.getProfilingInfo(), getSuites(),
!                         getLIRSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default);
!                         createSuites(graph.getOptions()), createLIRSuites(graph.getOptions()), new CompilationResult(), CompilationResultBuilderFactory.Default);
          int lineSPs = 0;
          for (Infopoint sp : cr.getInfopoints()) {
              assertNotNull(sp.reason);
              if (sp.reason == InfopointReason.BYTECODE_POSITION) {
                  ++lineSPs;