*** old/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java	Fri Jul  7 09:29:20 2017
--- new/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java	Fri Jul  7 09:29:20 2017

*** 57,67 ****
--- 57,70 ----
  import jdk.tools.jaotc.collect.directory.DirectorySourceProvider;
  import jdk.tools.jaotc.collect.jar.JarSourceProvider;
  import jdk.tools.jaotc.collect.module.ModuleSourceProvider;
  import jdk.tools.jaotc.utils.Timer;
  
+ import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
  import org.graalvm.compiler.api.runtime.GraalJVMCICompiler;
+ import org.graalvm.compiler.debug.DebugContext;
+ import org.graalvm.compiler.debug.DebugContext.Activation;
  import org.graalvm.compiler.hotspot.CompilerConfigurationFactory;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotGraalCompilerFactory;
  import org.graalvm.compiler.hotspot.HotSpotGraalOptionValues;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;

*** 70,79 ****
--- 73,83 ----
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.BasePhase;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
+ import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
  import org.graalvm.compiler.runtime.RuntimeProvider;
  
  import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.meta.ResolvedJavaType;

*** 465,474 ****
--- 469,479 ----
                  classesToCompile = null;
                  System.gc();
              }
  
              AOTBackend aotBackend = new AOTBackend(this, graalOptions, backend, filters);
+             SnippetReflectionProvider snippetReflection = aotBackend.getProviders().getSnippetReflection();
              AOTCompiler compiler = new AOTCompiler(this, graalOptions, aotBackend, options.threads);
              classes = compiler.compileClasses(classes);
  
              GraalHotSpotVMConfig graalHotSpotVMConfig = runtime.getVMConfig();
              PhaseSuite<HighTierContext> graphBuilderSuite = aotBackend.getGraphBuilderSuite();

*** 483,493 ****
--- 488,501 ----
                  System.gc();
              }
  
              BinaryContainer binaryContainer = new BinaryContainer(graalOptions, graalHotSpotVMConfig, graphBuilderConfig, JVM_VERSION);
              DataBuilder dataBuilder = new DataBuilder(this, backend, classes, binaryContainer);
              dataBuilder.prepareData();
+ 
+             try (DebugContext debug = DebugContext.create(graalOptions, new GraalDebugHandlersFactory(snippetReflection)); Activation a = debug.activate()) {
+                 dataBuilder.prepareData(debug);
+             }
  
              // Print information about section sizes
              printContainerInfo(binaryContainer.getHeaderContainer().getContainer());
              printContainerInfo(binaryContainer.getConfigContainer());
              printContainerInfo(binaryContainer.getKlassesOffsetsContainer());