*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java	Fri Jul  7 09:31:42 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java	Fri Jul  7 09:31:42 2017

*** 22,42 ****
--- 22,43 ----
   */
  package org.graalvm.compiler.replacements.test;
  
  import static org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll;
  
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.phases.HighTier;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
  import org.graalvm.compiler.nodes.StructuredGraph;
! import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
! import org.graalvm.compiler.nodes.StructuredGraph.Builder;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
  import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
  import org.graalvm.compiler.options.OptionValues;
+ import org.graalvm.compiler.phases.PhaseSuite;
+ import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.phases.tiers.Suites;
  import org.junit.Assert;
  import org.junit.Test;
  
  import jdk.vm.ci.meta.ResolvedJavaMethod;

*** 61,72 ****
--- 62,73 ----
      protected GraphBuilderConfiguration editGraphBuilderConfiguration(GraphBuilderConfiguration conf) {
          return super.editGraphBuilderConfiguration(conf).withBytecodeExceptionMode(CheckAll);
      }
  
      @Override
!     protected StructuredGraph parseEager(ResolvedJavaMethod m, AllowAssumptions allowAssumptions, CompilationIdentifier compilationId, OptionValues options) {
!         StructuredGraph graph = super.parseEager(m, allowAssumptions, compilationId, options);
!     protected StructuredGraph parse(Builder builder, PhaseSuite<HighTierContext> graphBuilderSuite) {
!         StructuredGraph graph = super.parse(builder, graphBuilderSuite);
          int handlers = graph.getNodes().filter(BytecodeExceptionNode.class).count();
          Assert.assertEquals(1, handlers);
          return graph;
      }