Mercurial > hg > truffle
diff src/share/vm/runtime/sweeper.cpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 15:36:48 +0200 |
parents | 7848fc12602b |
children |
line wrap: on
line diff
--- a/src/share/vm/runtime/sweeper.cpp Wed May 27 13:43:27 2015 +0200 +++ b/src/share/vm/runtime/sweeper.cpp Thu May 28 15:36:48 2015 +0200 @@ -241,7 +241,7 @@ void NMethodSweeper::possibly_sweep() { assert(JavaThread::current()->thread_state() == _thread_in_vm, "must run in vm mode"); // Only compiler threads are allowed to sweep - if (!MethodFlushing || !sweep_in_progress() NOT_GRAAL(|| !Thread::current()->is_Compiler_thread()) GRAAL_ONLY(|| !Thread::current()->is_Java_thread())) { + if (!MethodFlushing || !sweep_in_progress() NOT_JVMCI(|| !Thread::current()->is_Compiler_thread()) JVMCI_ONLY(|| !Thread::current()->is_Java_thread())) { return; } @@ -458,14 +458,14 @@ class NMethodMarker: public StackObj { private: -#ifdef GRAAL +#ifdef JVMCI JavaThread* _thread; #else CompilerThread* _thread; #endif public: NMethodMarker(nmethod* nm) { -#ifdef GRAAL +#ifdef JVMCI _thread = JavaThread::current(); #else _thread = CompilerThread::current();