Mercurial > hg > truffle
diff src/share/vm/memory/universe.cpp @ 12269:da051ce490eb
Merge
author | adlertz |
---|---|
date | Thu, 19 Sep 2013 18:01:39 +0200 |
parents | 23ae5a04724d 69f26e8e09f9 |
children | cefad50507d8 a6177f601c64 46d7652b223c |
line wrap: on
line diff
--- a/src/share/vm/memory/universe.cpp Thu Sep 19 09:34:20 2013 +0200 +++ b/src/share/vm/memory/universe.cpp Thu Sep 19 18:01:39 2013 +0200 @@ -602,7 +602,7 @@ } } -static intptr_t non_oop_bits = 0; +intptr_t Universe::_non_oop_bits = 0; void* Universe::non_oop_word() { // Neither the high bits nor the low bits of this value is allowed @@ -616,11 +616,11 @@ // Using the OS-supplied non-memory-address word (usually 0 or -1) // will take care of the high bits, however many there are. - if (non_oop_bits == 0) { - non_oop_bits = (intptr_t)os::non_memory_address_word() | 1; + if (_non_oop_bits == 0) { + _non_oop_bits = (intptr_t)os::non_memory_address_word() | 1; } - return (void*)non_oop_bits; + return (void*)_non_oop_bits; } jint universe_init() {