summaryrefslogtreecommitdiff
path: root/src/java_lang_System.cc
diff options
context:
space:
mode:
author buzbee <buzbee@google.com> 2011-08-31 10:43:51 -0700
committer buzbee <buzbee@google.com> 2011-09-01 15:59:35 -0700
commit1b4c85959b3d9a4a33bc2160c46c1bbde67350c7 (patch)
treed92052beeb7a5e29f955d91b0a4ba3b15d2e4a8d /src/java_lang_System.cc
parentcf4c6c41b0084dc4567ff709fb8ce9ebd72b26ac (diff)
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
Diffstat (limited to 'src/java_lang_System.cc')
-rw-r--r--src/java_lang_System.cc4
1 files changed, 2 insertions, 2 deletions
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;