ART: Use JniAbort instead of JniAbortF
Use JniAbort where possible to avoid a frame on the stack when
aborting.
Test: m test-art-host
Change-Id: I5efb99288b62b521c140ae285d959e68ee8f9c5f
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 927f94b..f96792d 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -400,13 +400,13 @@
#define CHECK_NON_NULL_ARGUMENT_FN_NAME(name, value, return_val) \
if (UNLIKELY((value) == nullptr)) { \
- JavaVmExtFromEnv(env)->JniAbortF(name, #value " == null"); \
+ JavaVmExtFromEnv(env)->JniAbort(name, #value " == null"); \
return return_val; \
}
#define CHECK_NON_NULL_MEMCPY_ARGUMENT(length, value) \
if (UNLIKELY((length) != 0 && (value) == nullptr)) { \
- JavaVmExtFromEnv(env)->JniAbortF(__FUNCTION__, #value " == null"); \
+ JavaVmExtFromEnv(env)->JniAbort(__FUNCTION__, #value " == null"); \
return; \
}