Mercurial > hg > truffle

diff src/share/vm/runtime/vmStructs.cpp @ 12942:ee99e1a7c5fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ccheung
date Fri, 18 Oct 2013 19:44:40 -0700
parents d2db09f281ca c51cd6af7e61
children 6b32b911d723
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp	Fri Oct 18 10:37:26 2013 +0000
+++ b/src/share/vm/runtime/vmStructs.cpp	Fri Oct 18 19:44:40 2013 -0700
@@ -58,7 +58,7 @@
 #include "memory/generation.hpp"
 #include "memory/generationSpec.hpp"
 #include "memory/heap.hpp"
-#include "memory/metablock.hpp"
+#include "memory/metachunk.hpp"
 #include "memory/referenceType.hpp"
 #include "memory/space.hpp"
 #include "memory/tenuredGeneration.hpp"
@@ -917,7 +917,6 @@
   volatile_nonstatic_field(JavaThread,         _exception_oop,                                oop)                                   \
   volatile_nonstatic_field(JavaThread,         _exception_pc,                                 address)                               \
   volatile_nonstatic_field(JavaThread,         _is_method_handle_return,                      int)                                   \
-  nonstatic_field(JavaThread,                  _is_compiling,                                 bool)                                  \
   nonstatic_field(JavaThread,                  _special_runtime_exit_condition,               JavaThread::AsyncRequests)             \
   nonstatic_field(JavaThread,                  _saved_exception_pc,                           address)                               \
    volatile_nonstatic_field(JavaThread,        _thread_state,                                 JavaThreadState)                       \