Mercurial > hg > truffle
changeset 18603:43e2cc9a4fde
removed reference to com.oracle.graal.compiler.CompilerThread from VM code
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 03 Dec 2014 18:53:22 +0100 |
parents | 7d8270532cd9 |
children | 39441c10d314 |
files | src/share/vm/classfile/systemDictionary.cpp src/share/vm/classfile/systemDictionary.hpp src/share/vm/runtime/thread.cpp |
diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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
--- 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) {