From 0f4c41d75c821162184501cd4b510a93f6eb580f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sun, 4 Sep 2011 14:58:03 -0700 Subject: Various fixes. CHECK_xx arguments should be the "right" way round, not backwards like ASSERT_xx and EXPECT_xx. Use /mnt/sdcard/ rather than /sdcard/ to bypass FUSE and avoid getting intermittent mkdir(2) "Device or resource busy" failures. Better diagnostics when methods not found by test helpers. Remove the whitelist from oatCompileMethod. Leave evidence in the log of what we've compiled and where we put it. Disable card marking by generated code until we have a cards to mark. Distinguish between CanPutArrayElementFromCode and CanPutArrayElement. Implement both. Add a new test to see how much of the basic System and String/StringBuilder facilities are working. Change-Id: Ie24f2859e404ab912e6cc77d170ceb4df5ecdf19 --- src/java_lang_System.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/java_lang_System.cc') diff --git a/src/java_lang_System.cc b/src/java_lang_System.cc index e45519e4b9..2bb767d5b7 100644 --- a/src/java_lang_System.cc +++ b/src/java_lang_System.cc @@ -213,14 +213,14 @@ void System_arraycopy(JNIEnv* env, jclass, jobject javaSrc, jint srcPos, jobject Class* initialElementClass = NULL; if (length > 0 && srcObj[0] != NULL) { initialElementClass = srcObj[0]->GetClass(); - if (!Class::CanPutArrayElementFromCode(initialElementClass, dstClass)) { + if (!Class::CanPutArrayElement(initialElementClass, dstClass)) { initialElementClass = NULL; } } int copyCount; for (copyCount = 0; copyCount < length; copyCount++) { - if (srcObj[copyCount] != NULL && srcObj[copyCount]->GetClass() != initialElementClass && !Class::CanPutArrayElementFromCode(srcObj[copyCount]->GetClass(), dstClass)) { + if (srcObj[copyCount] != NULL && srcObj[copyCount]->GetClass() != initialElementClass && !Class::CanPutArrayElement(srcObj[copyCount]->GetClass(), dstClass)) { // Can't put this element into the array. // We'll copy up to this point, then throw. break; -- cgit v1.2.3-59-g8ed1b