diff options
| author | 2014-10-17 02:29:32 +0000 | |
|---|---|---|
| committer | 2014-10-17 02:29:32 +0000 | |
| commit | b3f18cf7466f85e15c6b7f005f544867a4d6847a (patch) | |
| tree | 62035f08dc38038b74c9796118ae0bab0e7608fb /runtime/entrypoints/interpreter/interpreter_entrypoints.cc | |
| parent | cb142101f29a4f1e097f03a220db3da6d4bd679f (diff) | |
| parent | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (diff) | |
Merge "Make ART compile with GCC -O0 again."
Diffstat (limited to 'runtime/entrypoints/interpreter/interpreter_entrypoints.cc')
| -rw-r--r-- | runtime/entrypoints/interpreter/interpreter_entrypoints.cc | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/interpreter/interpreter_entrypoints.cc b/runtime/entrypoints/interpreter/interpreter_entrypoints.cc index b617636d13..908d3cd43c 100644 --- a/runtime/entrypoints/interpreter/interpreter_entrypoints.cc +++ b/runtime/entrypoints/interpreter/interpreter_entrypoints.cc @@ -25,7 +25,7 @@  namespace art {  // TODO: Make the MethodHelper here be compaction safe. -extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper& mh, +extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper* mh,                                                     const DexFile::CodeItem* code_item,                                                     ShadowFrame* shadow_frame, JValue* result) {    mirror::ArtMethod* method = shadow_frame->GetMethod(); @@ -54,7 +54,7 @@ extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper& m    } else {      method->Invoke(self, shadow_frame->GetVRegArgs(arg_offset),                     (shadow_frame->NumberOfVRegs() - arg_offset) * sizeof(uint32_t), -                   result, mh.GetShorty()); +                   result, mh->GetShorty());    }  }  |