Chromium Code Reviews| Index: runtime/vm/code_patcher_ia32.cc |
| =================================================================== |
| --- runtime/vm/code_patcher_ia32.cc (revision 24431) |
| +++ runtime/vm/code_patcher_ia32.cc (working copy) |
| @@ -231,9 +231,8 @@ |
| } |
| -uword CodePatcher::GetInstanceCallAt(uword return_address, |
| - const Code& code, |
| - ICData* ic_data) { |
| +uword CodePatcher::GetInstanceCallAt( |
| + uword return_address, const Code& code, ICData* ic_data) { |
| ASSERT(code.ContainsInstructionAt(return_address)); |
| InstanceCall call(return_address); |
| if (ic_data != NULL) { |
| @@ -243,12 +242,15 @@ |
| } |
| -RawFunction* CodePatcher::GetUnoptimizedStaticCallTargetAt( |
| - uword return_address, const Code& code) { |
| +RawFunction* CodePatcher::GetUnoptimizedStaticCallAt( |
| + uword return_address, const Code& code, ICData* ic_data_result) { |
|
siva
2013/06/25 21:21:05
why not keep the param name consistent with GetIns
srdjan
2013/06/25 21:26:08
Discussed offline. Leaving as it is, since we need
|
| ASSERT(code.ContainsInstructionAt(return_address)); |
| UnoptimizedStaticCall static_call(return_address); |
| ICData& ic_data = ICData::Handle(); |
| ic_data ^= static_call.ic_data(); |
| + if (ic_data_result != NULL) { |
| + *ic_data_result = ic_data.raw(); |
| + } |
| return ic_data.GetTargetAt(0); |
| } |