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

6959430: Make sure raw loads have control edge

Browse source 
Check that raw loads have control edge

Reviewed-by: never, twisti
This commit is contained in:
Vladimir Kozlov 2010-06-15 18:07:27 -07:00
parent 998865b735
commit 21f481e5dd
7 changed files with 48 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hotspot/src/share/vm/opto/graphKit.cpp
View file

@ -1789,9 +1789,10 @@ void GraphKit::increment_counter(address counter_addr) {
void GraphKit::increment_counter(Node* counter_addr) {
int adr_type = Compile::AliasIdxRaw;
Node* cnt = make_load(NULL, counter_addr, TypeInt::INT, T_INT, adr_type);
Node* ctrl = control();
Node* cnt = make_load(ctrl, counter_addr, TypeInt::INT, T_INT, adr_type);
Node* incr = _gvn.transform(new (C, 3) AddINode(cnt, _gvn.intcon(1)));
store_to_memory( NULL, counter_addr, incr, T_INT, adr_type );
store_to_memory( ctrl, counter_addr, incr, T_INT, adr_type );
}
@ -2771,11 +2772,7 @@ FastLockNode* GraphKit::shared_lock(Node* obj) {
// Update the counter for this lock. Don't bother using an atomic
// operation since we don't require absolute accuracy.
lock->create_lock_counter(map()->jvms());
int adr_type = Compile::AliasIdxRaw;
Node* counter_addr = makecon(TypeRawPtr::make(lock->counter()->addr()));
Node* cnt = make_load(NULL, counter_addr, TypeInt::INT, T_INT, adr_type);
Node* incr = _gvn.transform(new (C, 3) AddINode(cnt, _gvn.intcon(1)));
store_to_memory(control(), counter_addr, incr, T_INT, adr_type);
increment_counter(lock->counter()->addr());
}
#endif