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

*** 20,57 ****
--- 20,55 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test;
  
! import static org.graalvm.compiler.core.common.CompilationIdentifier.INVALID_COMPILATION_ID;
! import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions;
  import static org.graalvm.compiler.debug.DelegatingDebugConfig.Feature.INTERCEPT;
  
  import java.lang.reflect.Method;
  
  import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  import org.junit.Assume;
  import org.junit.Test;
  
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.DebugConfigScope;
  import org.graalvm.compiler.debug.DelegatingDebugConfig;
  import org.graalvm.compiler.java.GraphBuilderPhase;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.VerifyPhase;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.phases.util.Providers;
  import org.graalvm.compiler.runtime.RuntimeProvider;
  import org.graalvm.compiler.test.GraalTest;
+ import org.junit.Assume;
+ import org.junit.Test;
+ 
+ import jdk.vm.ci.meta.MetaAccessProvider;
+ import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  /**
   * Test that interfaces are correctly initialized by a static field resolution during eager graph
   * building.
   */

*** 90,100 ****
--- 88,98 ----
  
          Assume.assumeTrue(VerifyPhase.class.desiredAssertionStatus());
  
          final Method m = getMethod(clazz, methodName);
          ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m);
!         StructuredGraph graph = new StructuredGraph(method, AllowAssumptions.NO, INVALID_COMPILATION_ID);
!         StructuredGraph graph = new StructuredGraph.Builder(getInitialOptions()).method(method).build();
          try (DebugConfigScope s = Debug.setConfig(new DelegatingDebugConfig().disable(INTERCEPT)); Debug.Scope ds = Debug.scope("GraphBuilding", graph, method)) {
              graphBuilderSuite.apply(graph, context);
          } catch (Throwable e) {
              throw Debug.handle(e);
          }