mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-21 03:24:38 +02:00
6459085: naked pointer subtractions in class data sharing code
Reviewed-by: jcoomes
This commit is contained in:
parent
bf2763ee4e
commit
cf5e518aff
2 changed files with 9 additions and 5 deletions
|
@ -195,7 +195,7 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
|
|||
if [ $$? = 0 ] ; then \
|
||||
/usr/bin/chcon -t textrel_shlib_t $@; \
|
||||
if [ $$? != 0 ]; then \
|
||||
echo "ERROR: Cannot chcon $@"; exit 1; \
|
||||
echo "ERROR: Cannot chcon $@"; \
|
||||
fi \
|
||||
fi \
|
||||
fi \
|
||||
|
|
|
@ -1200,10 +1200,12 @@ public:
|
|||
mapinfo->write_space(CompactingPermGenGen::rw, _rw_space, false);
|
||||
_rw_space->set_saved_mark();
|
||||
mapinfo->write_region(CompactingPermGenGen::md, _md_vs->low(),
|
||||
md_top - _md_vs->low(), SharedMiscDataSize,
|
||||
pointer_delta(md_top, _md_vs->low(), sizeof(char)),
|
||||
SharedMiscDataSize,
|
||||
false, false);
|
||||
mapinfo->write_region(CompactingPermGenGen::mc, _mc_vs->low(),
|
||||
mc_top - _mc_vs->low(), SharedMiscCodeSize,
|
||||
pointer_delta(mc_top, _mc_vs->low(), sizeof(char)),
|
||||
SharedMiscCodeSize,
|
||||
true, true);
|
||||
|
||||
// Pass 2 - write data.
|
||||
|
@ -1212,10 +1214,12 @@ public:
|
|||
mapinfo->write_space(CompactingPermGenGen::ro, _ro_space, true);
|
||||
mapinfo->write_space(CompactingPermGenGen::rw, _rw_space, false);
|
||||
mapinfo->write_region(CompactingPermGenGen::md, _md_vs->low(),
|
||||
md_top - _md_vs->low(), SharedMiscDataSize,
|
||||
pointer_delta(md_top, _md_vs->low(), sizeof(char)),
|
||||
SharedMiscDataSize,
|
||||
false, false);
|
||||
mapinfo->write_region(CompactingPermGenGen::mc, _mc_vs->low(),
|
||||
mc_top - _mc_vs->low(), SharedMiscCodeSize,
|
||||
pointer_delta(mc_top, _mc_vs->low(), sizeof(char)),
|
||||
SharedMiscCodeSize,
|
||||
true, true);
|
||||
mapinfo->close();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue