archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8040919: Uninitialised memory in hotspot/src/share/vm/compiler/oopMap.cpp

Browse source 
Parfait refactoring in OopMapSet::update_register_map

Reviewed-by: kvn, twisti
This commit is contained in:
Morris Meyer 2014-04-28 16:05:12 -07:00
parent cd35f69721
commit 3fddcd2712
1 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
hotspot/src/share/vm/compiler/oopMap.cpp
View file

@ -467,7 +467,6 @@ void OopMapSet::update_register_map(const frame *fr, RegisterMap *reg_map) {
assert(cb != NULL, "no codeblob"); assert(cb != NULL, "no codeblob");
// Any reg might be saved by a safepoint handler (see generate_handler_blob). // Any reg might be saved by a safepoint handler (see generate_handler_blob).
const int max_saved_on_entry_reg_count = ConcreteRegisterImpl::number_of_registers;
assert( reg_map->_update_for_id == NULL || fr->is_older(reg_map->_update_for_id), assert( reg_map->_update_for_id == NULL || fr->is_older(reg_map->_update_for_id),
"already updated this map; do not 'update' it twice!" ); "already updated this map; do not 'update' it twice!" );
debug_only(reg_map->_update_for_id = fr->id()); debug_only(reg_map->_update_for_id = fr->id());
@ -477,27 +476,20 @@ void OopMapSet::update_register_map(const frame *fr, RegisterMap *reg_map) {
!cb->caller_must_gc_arguments(reg_map->thread())), !cb->caller_must_gc_arguments(reg_map->thread())),
"include_argument_oops should already be set"); "include_argument_oops should already be set");
int nof_callee = 0;
oop* locs[2*max_saved_on_entry_reg_count+1];
VMReg regs[2*max_saved_on_entry_reg_count+1];
// ("+1" because max_saved_on_entry_reg_count might be zero)
// Scan through oopmap and find location of all callee-saved registers // Scan through oopmap and find location of all callee-saved registers
// (we do not do update in place, since info could be overwritten) // (we do not do update in place, since info could be overwritten)
address pc = fr->pc(); address pc = fr->pc();
OopMap* map = cb->oop_map_for_return_address(pc); OopMap* map = cb->oop_map_for_return_address(pc);
assert(map != NULL, "no ptr map found"); assert(map != NULL, "no ptr map found");
DEBUG_ONLY(int nof_callee = 0;)
OopMapValue omv;
for (OopMapStream oms(map, OopMapValue::callee_saved_value); !oms.is_done(); oms.next()) { for (OopMapStream oms(map, OopMapValue::callee_saved_value); !oms.is_done(); oms.next()) {
omv = oms.current(); OopMapValue omv = oms.current();
assert(nof_callee < 2*max_saved_on_entry_reg_count, "overflow"); VMReg reg = omv.content_reg();
regs[nof_callee] = omv.content_reg(); oop* loc = fr->oopmapreg_to_location(omv.reg(), reg_map);
locs[nof_callee] = fr->oopmapreg_to_location(omv.reg(),reg_map); reg_map->set_location(reg, (address) loc);
nof_callee++; DEBUG_ONLY(nof_callee++;)
} }
// Check that runtime stubs save all callee-saved registers // Check that runtime stubs save all callee-saved registers
@ -506,11 +498,6 @@ void OopMapSet::update_register_map(const frame *fr, RegisterMap *reg_map) {
(nof_callee >= SAVED_ON_ENTRY_REG_COUNT || nof_callee >= C_SAVED_ON_ENTRY_REG_COUNT), (nof_callee >= SAVED_ON_ENTRY_REG_COUNT || nof_callee >= C_SAVED_ON_ENTRY_REG_COUNT),
"must save all"); "must save all");
#endif // COMPILER2 #endif // COMPILER2
// Copy found callee-saved register to reg_map
for(int i = 0; i < nof_callee; i++) {
reg_map->set_location(regs[i], (address)locs[i]);
}
} }
//============================================================================= //=============================================================================