Mercurial > hg > truffle
changeset 925:7c14587118b3
Merge
author | never |
---|---|
date | Fri, 14 Aug 2009 22:11:18 -0700 |
parents | 55784fd95fe3 (current diff) 1a81ea4b45d4 (diff) |
children | c8e2135f7e30 |
files | |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/memory/universe.cpp Fri Aug 14 15:55:26 2009 -0700 +++ b/src/share/vm/memory/universe.cpp Fri Aug 14 22:11:18 2009 -0700 @@ -749,7 +749,10 @@ assert(mode == UnscaledNarrowOop || mode == ZeroBasedNarrowOop || mode == HeapBasedNarrowOop, "mode is invalid"); - + // Return specified base for the first request. + if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) { + return (char*)HeapBaseMinAddress; + } const size_t total_size = heap_size + HeapBaseMinAddress; if (total_size <= OopEncodingHeapMax && (mode != HeapBasedNarrowOop)) { if (total_size <= NarrowOopHeapMax && (mode == UnscaledNarrowOop) && @@ -857,7 +860,7 @@ // Can't reserve heap below 4Gb. Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes); } else { - assert(Universe::narrow_oop_shift() == 0, "use unscaled narrow oop"); + Universe::set_narrow_oop_shift(0); if (PrintCompressedOopsMode) { tty->print(", 32-bits Oops"); }