Mercurial > hg > truffle
comparison src/share/vm/runtime/sharedRuntime.cpp @ 12317:a5ac0873476c
Merge
author | zgu |
---|---|
date | Fri, 27 Sep 2013 10:08:56 -0400 |
parents | 190899198332 891687731b59 |
children | cefad50507d8 570aaefce624 2b8e28fdf503 |
comparison
equal
deleted
inserted
replaced
12316:190899198332 | 12317:a5ac0873476c |
---|---|
1504 inline_cache->is_optimized(), | 1504 inline_cache->is_optimized(), |
1505 false, | 1505 false, |
1506 info, CHECK_(methodHandle())); | 1506 info, CHECK_(methodHandle())); |
1507 inline_cache->set_to_monomorphic(info); | 1507 inline_cache->set_to_monomorphic(info); |
1508 } else if (!inline_cache->is_megamorphic() && !inline_cache->is_clean()) { | 1508 } else if (!inline_cache->is_megamorphic() && !inline_cache->is_clean()) { |
1509 // Change to megamorphic | 1509 // Potential change to megamorphic |
1510 inline_cache->set_to_megamorphic(&call_info, bc, CHECK_(methodHandle())); | 1510 bool successful = inline_cache->set_to_megamorphic(&call_info, bc, CHECK_(methodHandle())); |
1511 if (!successful) { | |
1512 inline_cache->set_to_clean(); | |
1513 } | |
1511 } else { | 1514 } else { |
1512 // Either clean or megamorphic | 1515 // Either clean or megamorphic |
1513 } | 1516 } |
1514 } | 1517 } |
1515 } // Release CompiledIC_lock | 1518 } // Release CompiledIC_lock |