*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java	Fri Jul  7 09:30:05 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java	Fri Jul  7 09:30:04 2017

*** 25,34 ****
--- 25,35 ----
  import static java.util.Collections.singletonList;
  import static org.graalvm.compiler.core.GraalCompilerOptions.ExitVMOnException;
  import static org.graalvm.compiler.core.GraalCompilerOptions.PrintBailout;
  import static org.graalvm.compiler.core.GraalCompilerOptions.PrintStackTraceOnException;
  import static org.graalvm.compiler.core.test.ReflectionOptionDescriptors.extractEntries;
+ import static org.graalvm.compiler.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes;
  import static org.graalvm.compiler.hotspot.test.CompileTheWorld.Options.DESCRIPTORS;
  import static org.graalvm.compiler.serviceprovider.JDK9Method.Java8OrEarlier;
  
  import java.io.Closeable;
  import java.io.File;

*** 66,83 ****
--- 67,81 ----
  import java.util.stream.Collectors;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.bytecode.Bytecodes;
  import org.graalvm.compiler.core.CompilerThreadFactory;
  import org.graalvm.compiler.core.CompilerThreadFactory.DebugConfigAccess;
  import org.graalvm.compiler.core.test.ReflectionOptionDescriptors;
! import org.graalvm.compiler.debug.DebugEnvironment;
  import org.graalvm.compiler.debug.GraalDebugConfig;
! import org.graalvm.compiler.debug.DebugOptions;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.debug.MethodFilter;
  import org.graalvm.compiler.debug.TTY;
  import org.graalvm.compiler.debug.internal.MemUseTrackerImpl;
  import org.graalvm.compiler.hotspot.CompilationTask;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
  import org.graalvm.compiler.options.OptionDescriptors;

*** 217,227 ****
--- 215,225 ----
          // ...but we want to see exceptions.
          PrintBailout.putIfAbsent(compilationOptionsCopy, true);
          PrintStackTraceOnException.putIfAbsent(compilationOptionsCopy, true);
  
          // By default only report statistics for the CTW threads themselves
!         GraalDebugConfig.Options.DebugValueThreadFilter.putIfAbsent(compilationOptionsCopy, "^CompileTheWorld");
!         DebugOptions.MetricsThreadFilter.putIfAbsent(compilationOptionsCopy, "^CompileTheWorld");
          this.compilationOptions = compilationOptionsCopy;
      }
  
      public CompileTheWorld(HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotGraalCompiler compiler, OptionValues options) {
          this(jvmciRuntime, compiler, Options.Classpath.getValue(options),

*** 509,525 ****
--- 507,517 ----
              running = true;
          }
  
          OptionValues savedOptions = currentOptions;
          currentOptions = new OptionValues(compilationOptions);
!         threadPool = new ThreadPoolExecutor(threadCount, threadCount, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new CompilerThreadFactory("CompileTheWorld"));
                          new CompilerThreadFactory("CompileTheWorld", new DebugConfigAccess() {
                              @Override
                              public GraalDebugConfig getDebugConfig() {
                                  return DebugEnvironment.ensureInitialized(currentOptions, compiler.getGraalRuntime().getHostProviders().getSnippetReflection());
                              }
                          }));
  
          try {
              for (int i = 0; i < entries.length; i++) {
                  final String entry = entries[i];
  

*** 701,711 ****
--- 693,703 ----
       * Compiles a method and gathers some statistics.
       */
      private void compileMethod(HotSpotResolvedJavaMethod method, int counter) {
          try {
              long start = System.currentTimeMillis();
-             long allocatedAtStart = MemUseTrackerImpl.getCurrentThreadAllocatedBytes();
              int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI;
              HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, entryBCI, 0L);
              // For more stable CTW execution, disable use of profiling information
              boolean useProfilingInfo = false;
              boolean installAsDefault = false;

*** 716,726 ****
--- 708,718 ----
              HotSpotInstalledCode installedCode = task.getInstalledCode();
              if (installedCode != null) {
                  installedCode.invalidate();
              }
  
-             memoryUsed.getAndAdd(MemUseTrackerImpl.getCurrentThreadAllocatedBytes() - allocatedAtStart);
              compileTime.getAndAdd(System.currentTimeMillis() - start);
              compiledMethodsCounter.incrementAndGet();
          } catch (Throwable t) {
              // Catch everything and print a message
              println("CompileTheWorld (%d) : Error compiling method: %s", counter, method.format("%H.%n(%p):%r"));