diff options
| author | 2014-07-22 22:05:50 +0000 | |
|---|---|---|
| committer | 2014-07-22 16:18:32 +0000 | |
| commit | c389c97ca93b73b3cb380cedfe438d153b524225 (patch) | |
| tree | efb5f88c9fcb2ab87df05766fb14b3ae135d0f88 /compiler | |
| parent | c836fcbb52d99efdd9ed4f5c104aebd0c37cb121 (diff) | |
| parent | 2cdbad7c62f126581ec5177104de961c4d71adaa (diff) | |
Merge "Set vtable in class object to null after linking."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index 89295f2786..022ec6bc0d 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -231,8 +231,8 @@ inline int CompilerDriver::IsFastInvoke( // the super class. bool can_sharpen_super_based_on_type = (*invoke_type == kSuper) && (referrer_class != methods_class) && referrer_class->IsSubClass(methods_class) && - resolved_method->GetMethodIndex() < methods_class->GetVTable()->GetLength() && - (methods_class->GetVTable()->Get(resolved_method->GetMethodIndex()) == resolved_method); + resolved_method->GetMethodIndex() < methods_class->GetVTableLength() && + (methods_class->GetVTableEntry(resolved_method->GetMethodIndex()) == resolved_method); if (can_sharpen_virtual_based_on_type || can_sharpen_super_based_on_type) { // Sharpen a virtual call into a direct call. The method_idx is into referrer's |