commit 5599377396861f5d67019b4b239e897f67fe8835
author Andreas Gampe <agampe@google.com> Sat Mar 07 01:27:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 07 01:27:52 2015 +0000
tree 8200f7be1274a8ece7550067a017c6a43d2f58fb
parent b1869d56444215f91f27ae037479ce65aca4e2a5
parent e2be653f220106961ecb119063ef8b839ad1ad34

Merge "ART: Allow arraycopy with int[] in unstarted runtime"

runtime/interpreter/interpreter_common.cc

diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index 604e133..82d412c 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -986,7 +986,8 @@
     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);