Mercurial > hg > truffle
changeset 1143:aad340e07bc4
Merge
author | never |
---|---|
date | Wed, 06 Jan 2010 14:25:03 -0800 |
parents | b1f619d38249 (diff) 4ce7240d622c (current diff) |
children | 9b9c1ee9b3f6 |
files | |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Wed Jan 06 14:22:39 2010 -0800 +++ b/src/share/vm/code/nmethod.cpp Wed Jan 06 14:25:03 2010 -0800 @@ -1170,7 +1170,7 @@ } // Common functionality for both make_not_entrant and make_zombie -bool nmethod::make_not_entrant_or_zombie(int state) { +bool nmethod::make_not_entrant_or_zombie(unsigned int state) { assert(state == zombie || state == not_entrant, "must be zombie or not_entrant"); // If the method is already zombie there is nothing to do
--- a/src/share/vm/code/nmethod.hpp Wed Jan 06 14:22:39 2010 -0800 +++ b/src/share/vm/code/nmethod.hpp Wed Jan 06 14:25:03 2010 -0800 @@ -255,7 +255,7 @@ const char* reloc_string_for(u_char* begin, u_char* end); // Returns true if this thread changed the state of the nmethod or // false if another thread performed the transition. - bool make_not_entrant_or_zombie(int state); + bool make_not_entrant_or_zombie(unsigned int state); void inc_decompile_count(); // used to check that writes to nmFlags are done consistently.