diff options
| author | Ian Rogers <irogers@google.com> | 2014-02-12 01:16:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-12 01:16:30 +0000 |
| commit | fd14755c09ada4769b5b6658e484441ca3f628b5 (patch) | |
| tree | c70c10b6e319f44dadb56c78acaf7ce89b502d82 /runtime/entrypoints | |
| parent | 3c976a8f82007285316dd9d1bbccb659b0668a06 (diff) | |
| parent | 0177e53ea521ad58b70c305700dab32f1ac773b7 (diff) | |
| download | art-fd14755c09ada4769b5b6658e484441ca3f628b5.zip art-fd14755c09ada4769b5b6658e484441ca3f628b5.tar.gz art-fd14755c09ada4769b5b6658e484441ca3f628b5.tar.bz2 | |
Merge "Work in the direction of hard float quick ABIs."
Diffstat (limited to 'runtime/entrypoints')
| -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 8a2ce51..2067a45 100644 --- a/runtime/entrypoints/interpreter/interpreter_entrypoints.cc +++ b/runtime/entrypoints/interpreter/interpreter_entrypoints.cc @@ -48,11 +48,11 @@ extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper& m if (kUsePortableCompiler) { ArgArray arg_array(mh.GetShorty(), mh.GetShortyLength()); arg_array.BuildArgArrayFromFrame(shadow_frame, arg_offset); - method->Invoke(self, arg_array.GetArray(), arg_array.GetNumBytes(), result, mh.GetShorty()[0]); + method->Invoke(self, arg_array.GetArray(), arg_array.GetNumBytes(), result, mh.GetShorty()); } else { method->Invoke(self, shadow_frame->GetVRegArgs(arg_offset), (shadow_frame->NumberOfVRegs() - arg_offset) * sizeof(uint32_t), - result, mh.GetShorty()[0]); + result, mh.GetShorty()); } } |