From 1b4c85959b3d9a4a33bc2160c46c1bbde67350c7 Mon Sep 17 00:00:00 2001 From: buzbee Date: Wed, 31 Aug 2011 10:43:51 -0700 Subject: Complete OP_CONST_STRING, OP_CONST_CLASS Added dummy ThrowException & ResolveTypeFromCode routines. Fix OP_CONST_STRING and OP_CONST_CLASS to be position independent. Misc. bug fixes. Created a dummy ThrowException compiler run-time helper function. It should be replaced with the real version. Change-Id: Iba6a11cf110d3da4fa36ca434fe1b2675b68434d --- 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 e874987a1e..43335ac205 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::CanPutArrayElementNoThrow(initialElementClass, dstClass)) { + if (!Class::CanPutArrayElementFromCode(initialElementClass, dstClass)) { initialElementClass = NULL; } } int copyCount; for (copyCount = 0; copyCount < length; copyCount++) { - if (srcObj[copyCount] != NULL && srcObj[copyCount]->GetClass() != initialElementClass && !Class::CanPutArrayElementNoThrow(srcObj[copyCount]->GetClass(), dstClass)) { + if (srcObj[copyCount] != NULL && srcObj[copyCount]->GetClass() != initialElementClass && !Class::CanPutArrayElementFromCode(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