Mercurial > hg > truffle
comparison src/share/vm/memory/genOopClosures.inline.hpp @ 14521:29ccc4cbabca
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 12 Mar 2014 13:30:08 +0100 |
parents | 284953caf7aa |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14520:f84115370178 | 14521:29ccc4cbabca |
---|---|
43 _gen = gen; | 43 _gen = gen; |
44 _gen_boundary = _gen->reserved().start(); | 44 _gen_boundary = _gen->reserved().start(); |
45 // Barrier set for the heap, must be set after heap is initialized | 45 // Barrier set for the heap, must be set after heap is initialized |
46 if (_rs == NULL) { | 46 if (_rs == NULL) { |
47 GenRemSet* rs = SharedHeap::heap()->rem_set(); | 47 GenRemSet* rs = SharedHeap::heap()->rem_set(); |
48 assert(rs->rs_kind() == GenRemSet::CardTable, "Wrong rem set kind"); | |
49 _rs = (CardTableRS*)rs; | 48 _rs = (CardTableRS*)rs; |
50 } | 49 } |
51 } | 50 } |
52 | 51 |
53 template <class T> inline void OopsInGenClosure::do_barrier(T* p) { | 52 template <class T> inline void OopsInGenClosure::do_barrier(T* p) { |