Mercurial > hg > truffle
diff src/share/vm/memory/universe.cpp @ 17891:b6a2ba7d3ea7 hs25.20-b11
Merge
author | amurillo |
---|---|
date | Thu, 17 Apr 2014 16:09:07 -0700 |
parents | 9c3dc501b5eb |
children | 78bbf4d43a14 |
line wrap: on
line diff
--- a/src/share/vm/memory/universe.cpp Wed Apr 16 12:32:23 2014 -0700 +++ b/src/share/vm/memory/universe.cpp Thu Apr 17 16:09:07 2014 -0700 @@ -632,7 +632,6 @@ guarantee(sizeof(oop) % sizeof(HeapWord) == 0, "oop size is not not a multiple of HeapWord size"); TraceTime timer("Genesis", TraceStartupTime); - GC_locker::lock(); // do not allow gc during bootstrapping JavaClasses::compute_hard_coded_offsets(); jint status = Universe::initialize_heap(); @@ -1164,8 +1163,6 @@ MemoryService::add_metaspace_memory_pools(); - GC_locker::unlock(); // allow gc after bootstrapping - MemoryService::set_universe_heap(Universe::_collectedHeap); return true; }