archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6459085: naked pointer subtractions in class data sharing code

Browse source 
Reviewed-by: jcoomes
This commit is contained in:
Xiaobin Lu 2008-08-18 14:53:36 -07:00
parent bf2763ee4e
commit cf5e518aff
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/make/linux/makefiles/vm.make
View file

@ -195,7 +195,7 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
if [ $$? = 0 ] ; then \ if [ $$? = 0 ] ; then \
/usr/bin/chcon -t textrel_shlib_t $@; \ /usr/bin/chcon -t textrel_shlib_t $@; \
if [ $$? != 0 ]; then \ if [ $$? != 0 ]; then \
echo "ERROR: Cannot chcon $@"; exit 1; \ echo "ERROR: Cannot chcon $@"; \
fi \ fi \
fi \ fi \
fi \ fi \

12
hotspot/src/share/vm/memory/dump.cpp
View file

@ -1200,10 +1200,12 @@ public:
mapinfo->write_space(CompactingPermGenGen::rw, _rw_space, false); mapinfo->write_space(CompactingPermGenGen::rw, _rw_space, false);
_rw_space->set_saved_mark(); _rw_space->set_saved_mark();
mapinfo->write_region(CompactingPermGenGen::md, _md_vs->low(), 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); false, false);
mapinfo->write_region(CompactingPermGenGen::mc, _mc_vs->low(), 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); true, true);
// Pass 2 - write data. // Pass 2 - write data.
@ -1212,10 +1214,12 @@ public:
mapinfo->write_space(CompactingPermGenGen::ro, _ro_space, true); mapinfo->write_space(CompactingPermGenGen::ro, _ro_space, true);
mapinfo->write_space(CompactingPermGenGen::rw, _rw_space, false); mapinfo->write_space(CompactingPermGenGen::rw, _rw_space, false);
mapinfo->write_region(CompactingPermGenGen::md, _md_vs->low(), 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); false, false);
mapinfo->write_region(CompactingPermGenGen::mc, _mc_vs->low(), 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); true, true);
mapinfo->close(); mapinfo->close();