commit 2d76b041be770102fc912effc398e629a18180d2
author buzbee <buzbee@google.com> Thu Dec 20 15:05:43 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 20 15:05:44 2012 -0800
tree 5992d829897b22c14f63922d22e5f395865f2735
parent 11a796e42027a926d972f1232484d577cbe01f84
parent d8506218bfe0fec7b3c7ef10818a9266e77ace4a

Merge "Compiler: GBC fix, CFG dump enhancements" into dalvik-dev

src/check_jni.cc

diff --git a/src/check_jni.cc b/src/check_jni.cc
index 026dfe6..8f4e921 100644
--- a/src/check_jni.cc
+++ b/src/check_jni.cc
@@ -748,7 +748,7 @@
    */
   void CheckReleaseMode(jint mode) {
     if (mode != 0 && mode != JNI_COMMIT && mode != JNI_ABORT) {
-      JniAbortF(function_name_, "bad value for release mode: %d", mode);
+      JniAbortF(function_name_, "unknown value for release mode: %d", mode);
     }
   }
 

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index 6e40cf4..8c0c1ec 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -644,7 +644,9 @@
 
   static jboolean IsInstanceOf(JNIEnv* env, jobject jobj, jclass java_class) {
     ScopedObjectAccess soa(env);
-    CHECK_NE(static_cast<jclass>(NULL), java_class); // TODO: ReportJniError
+    if (java_class == NULL) {
+      JniAbortF("IsInstanceOf", "null class (second argument)");
+    }
     if (jobj == NULL) {
       // Note: JNI is different from regular Java instanceof in this respect
       return JNI_TRUE;
@@ -1761,7 +1763,9 @@
   static jsize GetArrayLength(JNIEnv* env, jarray java_array) {
     ScopedObjectAccess soa(env);
     Object* obj = soa.Decode<Object*>(java_array);
-    CHECK(obj->IsArrayInstance()); // TODO: ReportJniError
+    if (!obj->IsArrayInstance()) {
+      JniAbortF("GetArrayLength", "not an array: %s", PrettyTypeOf(obj).c_str());
+    }
     Array* array = obj->AsArray();
     return array->GetLength();
   }
@@ -1817,7 +1821,9 @@
 
   static jobjectArray NewObjectArray(JNIEnv* env, jsize length, jclass element_jclass, jobject initial_element) {
     ScopedObjectAccess soa(env);
-    CHECK_GE(length, 0); // TODO: ReportJniError
+    if (length < 0) {
+      JniAbortF("NewObjectArray", "negative array length: %d", length);
+    }
 
     // Compute the array class corresponding to the given element class.
     Class* element_class = soa.Decode<Class*>(element_jclass);
@@ -2105,11 +2111,14 @@
   }
 
   static jobject NewDirectByteBuffer(JNIEnv* env, void* address, jlong capacity) {
-    // The address may not be NULL, and the capacity must be > 0.
-    CHECK(address != NULL); // TODO: ReportJniError
-    CHECK_GT(capacity, 0); // TODO: ReportJniError
+    if (capacity < 0) {
+      JniAbortF("NewDirectByteBuffer", "negative buffer capacity: %d", capacity);
+    }
+    if (address == NULL && capacity != 0) {
+      JniAbortF("NewDirectByteBuffer", "non-zero capacity for NULL pointer: %d", capacity);
+    }
 
-    // At the moment, the Java side is limited to 32 bisoa.
+    // At the moment, the Java side is limited to 32 bits.
     CHECK_LE(reinterpret_cast<uintptr_t>(address), 0xffffffff);
     CHECK_LE(capacity, 0xffffffff);
     jint address_arg = reinterpret_cast<jint>(address);
@@ -2130,7 +2139,9 @@
   }
 
   static jobjectRefType GetObjectRefType(JNIEnv* env, jobject java_object) {
-    CHECK(java_object != NULL); // TODO: ReportJniError
+    if (java_object == NULL) {
+      JniAbortF("GetObjectRefType", "null object");
+    }
 
     // Do we definitely know what kind of reference this is?
     IndirectRef ref = reinterpret_cast<IndirectRef>(java_object);
@@ -2192,7 +2203,9 @@
   template<typename JniT, typename ArtT>
   static JniT NewPrimitiveArray(const ScopedObjectAccess& soa, jsize length)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-    CHECK_GE(length, 0); // TODO: ReportJniError
+    if (length < 0) {
+      JniAbortF("NewPrimitiveArray", "negative array length: %d", length);
+    }
     ArtT* result = ArtT::Alloc(soa.Self(), length);
     return soa.AddLocalReference<JniT>(result);
   }