# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1417629202 -3600
# Node ID 43e2cc9a4fde1d5c631569874e55d3b45922925d
# Parent  7d8270532cd9c456a53b6d79d60195798d29d3c6
removed reference to com.oracle.graal.compiler.CompilerThread from VM code

diff -r 7d8270532cd9 -r 43e2cc9a4fde src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp	Wed Dec 03 16:07:22 2014 +0100
+++ b/src/share/vm/classfile/systemDictionary.cpp	Wed Dec 03 18:53:22 2014 +0100
@@ -1933,7 +1933,7 @@
 
 #ifdef GRAAL
 void SystemDictionary::initialize_preloaded_graal_classes(TRAPS) {
-  assert(WK_KLASS(CompilerThread_klass) == NULL, "preloaded Graal classes should only be initialized once");
+  assert(WK_KLASS(Node_klass) == NULL, "preloaded Graal classes should only be initialized once");
   if (UseGraalClassLoader) {
     _graal_loader = GraalRuntime::compute_graal_class_loader(CHECK);
   }
diff -r 7d8270532cd9 -r 43e2cc9a4fde src/share/vm/classfile/systemDictionary.hpp
--- a/src/share/vm/classfile/systemDictionary.hpp	Wed Dec 03 16:07:22 2014 +0100
+++ b/src/share/vm/classfile/systemDictionary.hpp	Wed Dec 03 18:53:22 2014 +0100
@@ -186,7 +186,6 @@
   /* Support for Graal */                                                                                                \
   do_klass(BitSet_klass,                                java_util_BitSet,                          Opt                 ) \
   /* Graal classes */                                                                                                    \
-  GRAAL_ONLY(do_klass(CompilerThread_klass,                  com_oracle_graal_compiler_CompilerThread,                     Graal)) \
   GRAAL_ONLY(do_klass(Node_klass,                            com_oracle_graal_graph_Node,                                  Graal)) \
   GRAAL_ONLY(do_klass(NodeClass_klass,                       com_oracle_graal_graph_NodeClass,                             Graal)) \
   GRAAL_ONLY(do_klass(HotSpotCompiledCode_klass,             com_oracle_graal_hotspot_HotSpotCompiledCode,                 Graal)) \
@@ -262,7 +261,7 @@
     WKID_LIMIT,
 
 #ifdef GRAAL
-    FIRST_GRAAL_WKID = WK_KLASS_ENUM_NAME(CompilerThread_klass),
+    FIRST_GRAAL_WKID = WK_KLASS_ENUM_NAME(Node_klass),
     LAST_GRAAL_WKID  = WK_KLASS_ENUM_NAME(AbstractValue_klass),
 #endif
 
diff -r 7d8270532cd9 -r 43e2cc9a4fde src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Wed Dec 03 16:07:22 2014 +0100
+++ b/src/share/vm/runtime/thread.cpp	Wed Dec 03 18:53:22 2014 +0100
@@ -1433,7 +1433,7 @@
 
 bool graal_counters_include(JavaThread* thread) {
   oop threadObj = thread->threadObj();
-  return !GraalCountersExcludeCompiler || (!thread->is_Compiler_thread() && (threadObj == NULL || threadObj->klass() != SystemDictionary::CompilerThread_klass()));
+  return !GraalCountersExcludeCompiler || !thread->is_Compiler_thread();
 }
 
 void JavaThread::collect_counters(typeArrayOop array) {