--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThread.java	Fri Jul 07 10:37:52 2017 +0200
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilerThread.java	Fri Jul 07 09:40:47 2017 -0700
@@ -22,42 +22,21 @@
  */
 package org.graalvm.compiler.core;
 
-import org.graalvm.compiler.core.CompilerThreadFactory.DebugConfigAccess;
-import org.graalvm.compiler.debug.DebugConfig;
-import org.graalvm.compiler.debug.DebugDumpHandler;
-import org.graalvm.compiler.debug.GraalDebugConfig;
-
 /**
- * A compiler thread is a daemon thread that runs at {@link Thread#MAX_PRIORITY} and executes in the
- * context of a thread-local {@linkplain GraalDebugConfig debug configuration}.
+ * A compiler thread is a daemon thread that runs at {@link Thread#MAX_PRIORITY}.
  */
 public class CompilerThread extends Thread {
 
-    private final DebugConfigAccess debugConfigAccess;
-
-    public CompilerThread(Runnable r, String namePrefix, DebugConfigAccess debugConfigAccess) {
+    public CompilerThread(Runnable r, String namePrefix) {
         super(r);
         this.setName(namePrefix + "-" + this.getId());
         this.setPriority(Thread.MAX_PRIORITY);
         this.setDaemon(true);
-        this.debugConfigAccess = debugConfigAccess;
     }
 
     @Override
     public void run() {
-        DebugConfig debugConfig = debugConfigAccess.getDebugConfig();
         setContextClassLoader(getClass().getClassLoader());
-        try {
-            super.run();
-        } finally {
-            if (debugConfig != null) {
-                for (DebugDumpHandler dumpHandler : debugConfig.dumpHandlers()) {
-                    try {
-                        dumpHandler.close();
-                    } catch (Throwable t) {
-                    }
-                }
-            }
-        }
+        super.run();
     }
 }