diff options
| author | 2016-04-01 16:51:47 +0000 | |
|---|---|---|
| committer | 2016-04-01 16:51:47 +0000 | |
| commit | 01afcbba19e40db984d41974086d63bbdd9cb955 (patch) | |
| tree | 9051e8774fb0ec30e230ee8d7c77bc37bd91405c /runtime/native/java_lang_System.cc | |
| parent | 85f5de08d02515b36e381834967d5d047d5bbcc4 (diff) | |
| parent | 85a098af5fc8d2dd0e39d61c9f93fc6257d631c5 (diff) | |
Merge "ART: Better support for arraycopy in unstarted runtime"
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. |