diff options
| author | 2013-08-12 08:53:04 -0700 | |
|---|---|---|
| committer | 2013-08-13 10:09:48 -0700 | |
| commit | 08bf1967611965b65ffd5de1aa603b60e7b2d6a8 (patch) | |
| tree | a9272c3a767cee878fdad81207bd8037f08dd830 /runtime/class_linker.cc | |
| parent | 73a79074c06d8b0a8c14946438c59c3821d88fe7 (diff) | |
Work on SMALL_ART and PORTABLE working at the same time.
Change-Id: Iddedf63b6f9d908717a4d30f963e9b81a9604d49
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 71959c66ab..c7a8f7e3d4 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -71,7 +71,7 @@ namespace art { -extern "C" void artInterperterToCompiledCodeBridge(Thread* self, MethodHelper& mh, +extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper& mh, const DexFile::CodeItem* code_item, ShadowFrame* shadow_frame, JValue* result); @@ -1649,7 +1649,7 @@ static void LinkCode(SirtRef<mirror::AbstractMethod>& method, const OatFile::Oat if (enter_interpreter) { method->SetEntryPointFromInterpreter(interpreter::artInterpreterToInterpreterBridge); } else { - method->SetEntryPointFromInterpreter(artInterperterToCompiledCodeBridge); + method->SetEntryPointFromInterpreter(artInterpreterToCompiledCodeBridge); } if (method->IsAbstract()) { @@ -2633,7 +2633,7 @@ mirror::AbstractMethod* ClassLinker::CreateProxyMethod(Thread* self, SirtRef<mir method->SetFpSpillMask(refs_and_args->GetFpSpillMask()); method->SetFrameSizeInBytes(refs_and_args->GetFrameSizeInBytes()); method->SetEntryPointFromCompiledCode(GetProxyInvokeHandler()); - method->SetEntryPointFromInterpreter(artInterperterToCompiledCodeBridge); + method->SetEntryPointFromInterpreter(artInterpreterToCompiledCodeBridge); return method; } |