diff options
Diffstat (limited to 'runtime/native/java_lang_System.cc')
| -rw-r--r-- | runtime/native/java_lang_System.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc index d9863c579e..9e2d68d363 100644 --- a/runtime/native/java_lang_System.cc +++ b/runtime/native/java_lang_System.cc @@ -149,7 +149,9 @@ static void System_arraycopy(JNIEnv* env, jclass, jobject javaSrc, jint srcPos, dstObjArray->AssignableMemcpy(dstPos, srcObjArray, srcPos, count); return; } - dstObjArray->AssignableCheckingMemcpy(dstPos, srcObjArray, srcPos, count, true); + // This code is never run under a transaction. + DCHECK(!Runtime::Current()->IsActiveTransaction()); + dstObjArray->AssignableCheckingMemcpy<false>(dstPos, srcObjArray, srcPos, count, true); } // Template to convert general array to that of its specific primitive type. |