diff options
| author | 2015-03-07 01:27:52 +0000 | |
|---|---|---|
| committer | 2015-03-07 01:27:52 +0000 | |
| commit | 5599377396861f5d67019b4b239e897f67fe8835 (patch) | |
| tree | 8200f7be1274a8ece7550067a017c6a43d2f58fb /runtime/interpreter/interpreter_common.cc | |
| parent | b1869d56444215f91f27ae037479ce65aca4e2a5 (diff) | |
| parent | e2be653f220106961ecb119063ef8b839ad1ad34 (diff) | |
Merge "ART: Allow arraycopy with int[] in unstarted runtime"
Diffstat (limited to 'runtime/interpreter/interpreter_common.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_common.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index 604e1337e6..82d412c505 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -986,7 +986,8 @@ static void UnstartedRuntimeInvoke(Thread* self, const DexFile::CodeItem* code_ mirror::ArtMethod* method = shadow_frame->GetVRegReference(arg_offset)->AsArtMethod(); result->SetL(method->GetNameAsString(self)); } else if (name == "void java.lang.System.arraycopy(java.lang.Object, int, java.lang.Object, int, int)" || - name == "void java.lang.System.arraycopy(char[], int, char[], int, int)") { + name == "void java.lang.System.arraycopy(char[], int, char[], int, int)" || + name == "void java.lang.System.arraycopy(int[], int, int[], int, int)") { // Special case array copying without initializing System. Class* ctype = shadow_frame->GetVRegReference(arg_offset)->GetClass()->GetComponentType(); jint srcPos = shadow_frame->GetVReg(arg_offset + 1); |