diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-06 17:11:47 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-06 17:11:47 -0800 |
| commit | e2be653f220106961ecb119063ef8b839ad1ad34 (patch) | |
| tree | 4d5b228b9d39d9bd86f415b3bf825565a6b183d4 /runtime | |
| parent | 41b15f9f06c7e2e5aac13f709c66412e6c299b67 (diff) | |
| download | art-e2be653f220106961ecb119063ef8b839ad1ad34.tar.gz art-e2be653f220106961ecb119063ef8b839ad1ad34.tar.bz2 art-e2be653f220106961ecb119063ef8b839ad1ad34.zip | |
ART: Allow arraycopy with int[] in unstarted runtime
Overlooked in the condition, the actual code was already there.
Bug: 19542228
Change-Id: I30caf77b345cb9bdb1f54c28bf4d42852c9a3298
Diffstat (limited to 'runtime')
| -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); |