Mercurial > hg > graal-jvmci-8

comparison src/share/vm/prims/jniCheck.cpp @ 23286:dd9cc155639c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u66-b17
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Thu, 07 Jan 2016 17:28:46 +0100
parents 7848fc12602b 9904bb920313
children 9b69cec6d01b
comparison
equal deleted inserted replaced
22786:ac649db7fec4 23286:dd9cc155639c
1 /* 1 /*
2 * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
51 #endif 51 #endif
52 #ifdef TARGET_ARCH_ppc 52 #ifdef TARGET_ARCH_ppc
53 # include "jniTypes_ppc.hpp" 53 # include "jniTypes_ppc.hpp"
54 #endif 54 #endif
55 55
56 // Complain every extra number of unplanned local refs
57 #define CHECK_JNI_LOCAL_REF_CAP_WARN_THRESHOLD 32
56 58
57 // Heap objects are allowed to be directly referenced only in VM code, 59 // Heap objects are allowed to be directly referenced only in VM code,
58 // not in native code. 60 // not in native code.
59 61
60 #define ASSERT_OOPS_ALLOWED \ 62 #define ASSERT_OOPS_ALLOWED \
166 168
167 /* 169 /*
168 * SUPPORT FUNCTIONS 170 * SUPPORT FUNCTIONS
169 */ 171 */
170 172
173 /**
174 * Check whether or not a programmer has actually checked for exceptions. According
175 * to the JNI Specification ("jni/spec/design.html#java_exceptions"):
176 *
177 * There are two cases where the programmer needs to check for exceptions without
178 * being able to first check an error code:
179 *
180 * - The JNI functions that invoke a Java method return the result of the Java method.
181 * The programmer must call ExceptionOccurred() to check for possible exceptions
182 * that occurred during the execution of the Java method.
183 *
184 * - Some of the JNI array access functions do not return an error code, but may
185 * throw an ArrayIndexOutOfBoundsException or ArrayStoreException.
186 *
187 * In all other cases, a non-error return value guarantees that no exceptions have been thrown.
188 *
189 * Programmers often defend against ArrayIndexOutOfBoundsException, so warning
190 * for these functions would be pedantic.
191 */
192 static inline void
193 check_pending_exception(JavaThread* thr) {
194 if (thr->has_pending_exception()) {
195 NativeReportJNIWarning(thr, "JNI call made with exception pending");
196 }
197 if (thr->is_pending_jni_exception_check()) {
198 IN_VM(
199 tty->print_cr("WARNING in native method: JNI call made without checking exceptions when required to from %s",
200 thr->get_pending_jni_exception_check());
201 thr->print_stack();
202 )
203 thr->clear_pending_jni_exception_check(); // Just complain once
204 }
205 }
206
207 /**
208 * Add to the planned number of handles. I.e. plus current live & warning threshold
209 */
210 static inline void
211 add_planned_handle_capacity(JNIHandleBlock* handles, size_t capacity) {
212 handles->set_planned_capacity(capacity +
213 handles->get_number_of_live_handles() +
214 CHECK_JNI_LOCAL_REF_CAP_WARN_THRESHOLD);
215 }
216
217
171 static inline void 218 static inline void
172 functionEnterCritical(JavaThread* thr) 219 functionEnterCritical(JavaThread* thr)
173 { 220 {
174 if (thr->has_pending_exception()) { 221 check_pending_exception(thr);
175 NativeReportJNIWarning(thr, "JNI call made with exception pending");
176 }
177 } 222 }
178 223
179 static inline void 224 static inline void
180 functionEnterCriticalExceptionAllowed(JavaThread* thr) 225 functionEnterCriticalExceptionAllowed(JavaThread* thr)
181 { 226 {
185 functionEnter(JavaThread* thr) 230 functionEnter(JavaThread* thr)
186 { 231 {
187 if (thr->in_critical()) { 232 if (thr->in_critical()) {
188 tty->print_cr("%s", warn_other_function_in_critical); 233 tty->print_cr("%s", warn_other_function_in_critical);
189 } 234 }
190 if (thr->has_pending_exception()) { 235 check_pending_exception(thr);
191 NativeReportJNIWarning(thr, "JNI call made with exception pending");
192 }
193 } 236 }
194 237
195 static inline void 238 static inline void
196 functionEnterExceptionAllowed(JavaThread* thr) 239 functionEnterExceptionAllowed(JavaThread* thr)
197 { 240 {
199 tty->print_cr("%s", warn_other_function_in_critical); 242 tty->print_cr("%s", warn_other_function_in_critical);
200 } 243 }
201 } 244 }
202 245
203 static inline void 246 static inline void
204 functionExit(JNIEnv *env) 247 functionExit(JavaThread* thr)
205 { 248 {
206 /* nothing to do at this time */ 249 JNIHandleBlock* handles = thr->active_handles();
250 size_t planned_capacity = handles->get_planned_capacity();
251 size_t live_handles = handles->get_number_of_live_handles();
252 if (live_handles > planned_capacity) {
253 IN_VM(
254 tty->print_cr("WARNING: JNI local refs: %zu, exceeds capacity: %zu",
255 live_handles, planned_capacity);
256 thr->print_stack();
257 )
258 // Complain just the once, reset to current + warn threshold
259 add_planned_handle_capacity(handles, 0);
260 }
207 } 261 }
208 262
209 static inline void 263 static inline void
210 checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype) 264 checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype)
211 { 265 {
506 functionEnter(thr); 560 functionEnter(thr);
507 IN_VM( 561 IN_VM(
508 jniCheck::validate_object(thr, loader); 562 jniCheck::validate_object(thr, loader);
509 ) 563 )
510 jclass result = UNCHECKED()->DefineClass(env, name, loader, buf, len); 564 jclass result = UNCHECKED()->DefineClass(env, name, loader, buf, len);
511 functionExit(env); 565 functionExit(thr);
512 return result; 566 return result;
513 JNI_END 567 JNI_END
514 568
515 JNI_ENTRY_CHECKED(jclass, 569 JNI_ENTRY_CHECKED(jclass,
516 checked_jni_FindClass(JNIEnv *env, 570 checked_jni_FindClass(JNIEnv *env,
518 functionEnter(thr); 572 functionEnter(thr);
519 IN_VM( 573 IN_VM(
520 jniCheck::validate_class_descriptor(thr, name); 574 jniCheck::validate_class_descriptor(thr, name);
521 ) 575 )
522 jclass result = UNCHECKED()->FindClass(env, name); 576 jclass result = UNCHECKED()->FindClass(env, name);
523 functionExit(env); 577 functionExit(thr);
524 return result; 578 return result;
525 JNI_END 579 JNI_END
526 580
527 JNI_ENTRY_CHECKED(jmethodID, 581 JNI_ENTRY_CHECKED(jmethodID,
528 checked_jni_FromReflectedMethod(JNIEnv *env, 582 checked_jni_FromReflectedMethod(JNIEnv *env,
530 functionEnter(thr); 584 functionEnter(thr);
531 IN_VM( 585 IN_VM(
532 jniCheck::validate_object(thr, method); 586 jniCheck::validate_object(thr, method);
533 ) 587 )
534 jmethodID result = UNCHECKED()->FromReflectedMethod(env, method); 588 jmethodID result = UNCHECKED()->FromReflectedMethod(env, method);
535 functionExit(env); 589 functionExit(thr);
536 return result; 590 return result;
537 JNI_END 591 JNI_END
538 592
539 JNI_ENTRY_CHECKED(jfieldID, 593 JNI_ENTRY_CHECKED(jfieldID,
540 checked_jni_FromReflectedField(JNIEnv *env, 594 checked_jni_FromReflectedField(JNIEnv *env,
542 functionEnter(thr); 596 functionEnter(thr);
543 IN_VM( 597 IN_VM(
544 jniCheck::validate_object(thr, field); 598 jniCheck::validate_object(thr, field);
545 ) 599 )
546 jfieldID result = UNCHECKED()->FromReflectedField(env, field); 600 jfieldID result = UNCHECKED()->FromReflectedField(env, field);
547 functionExit(env); 601 functionExit(thr);
548 return result; 602 return result;
549 JNI_END 603 JNI_END
550 604
551 JNI_ENTRY_CHECKED(jobject, 605 JNI_ENTRY_CHECKED(jobject,
552 checked_jni_ToReflectedMethod(JNIEnv *env, 606 checked_jni_ToReflectedMethod(JNIEnv *env,
558 jniCheck::validate_class(thr, cls, false); 612 jniCheck::validate_class(thr, cls, false);
559 jniCheck::validate_jmethod_id(thr, methodID); 613 jniCheck::validate_jmethod_id(thr, methodID);
560 ) 614 )
561 jobject result = UNCHECKED()->ToReflectedMethod(env, cls, methodID, 615 jobject result = UNCHECKED()->ToReflectedMethod(env, cls, methodID,
562 isStatic); 616 isStatic);
563 functionExit(env); 617 functionExit(thr);
564 return result; 618 return result;
565 JNI_END 619 JNI_END
566 620
567 JNI_ENTRY_CHECKED(jclass, 621 JNI_ENTRY_CHECKED(jclass,
568 checked_jni_GetSuperclass(JNIEnv *env, 622 checked_jni_GetSuperclass(JNIEnv *env,
570 functionEnter(thr); 624 functionEnter(thr);
571 IN_VM( 625 IN_VM(
572 jniCheck::validate_class(thr, sub, true); 626 jniCheck::validate_class(thr, sub, true);
573 ) 627 )
574 jclass result = UNCHECKED()->GetSuperclass(env, sub); 628 jclass result = UNCHECKED()->GetSuperclass(env, sub);
575 functionExit(env); 629 functionExit(thr);
576 return result; 630 return result;
577 JNI_END 631 JNI_END
578 632
579 JNI_ENTRY_CHECKED(jboolean, 633 JNI_ENTRY_CHECKED(jboolean,
580 checked_jni_IsAssignableFrom(JNIEnv *env, 634 checked_jni_IsAssignableFrom(JNIEnv *env,
584 IN_VM( 638 IN_VM(
585 jniCheck::validate_class(thr, sub, true); 639 jniCheck::validate_class(thr, sub, true);
586 jniCheck::validate_class(thr, sup, true); 640 jniCheck::validate_class(thr, sup, true);
587 ) 641 )
588 jboolean result = UNCHECKED()->IsAssignableFrom(env, sub, sup); 642 jboolean result = UNCHECKED()->IsAssignableFrom(env, sub, sup);
589 functionExit(env); 643 functionExit(thr);
590 return result; 644 return result;
591 JNI_END 645 JNI_END
592 646
593 JNI_ENTRY_CHECKED(jobject, 647 JNI_ENTRY_CHECKED(jobject,
594 checked_jni_ToReflectedField(JNIEnv *env, 648 checked_jni_ToReflectedField(JNIEnv *env,
599 IN_VM( 653 IN_VM(
600 jniCheck::validate_class(thr, cls, false); 654 jniCheck::validate_class(thr, cls, false);
601 ) 655 )
602 jobject result = UNCHECKED()->ToReflectedField(env, cls, fieldID, 656 jobject result = UNCHECKED()->ToReflectedField(env, cls, fieldID,
603 isStatic); 657 isStatic);
604 functionExit(env); 658 functionExit(thr);
605 return result; 659 return result;
606 JNI_END 660 JNI_END
607 661
608 JNI_ENTRY_CHECKED(jint, 662 JNI_ENTRY_CHECKED(jint,
609 checked_jni_Throw(JNIEnv *env, 663 checked_jni_Throw(JNIEnv *env,
617 } else { 671 } else {
618 jniCheck::validate_throwable_klass(thr, oopObj->klass()); 672 jniCheck::validate_throwable_klass(thr, oopObj->klass());
619 } 673 }
620 ) 674 )
621 jint result = UNCHECKED()->Throw(env, obj); 675 jint result = UNCHECKED()->Throw(env, obj);
622 functionExit(env); 676 functionExit(thr);
623 return result; 677 return result;
624 JNI_END 678 JNI_END
625 679
626 JNI_ENTRY_CHECKED(jint, 680 JNI_ENTRY_CHECKED(jint,
627 checked_jni_ThrowNew(JNIEnv *env, 681 checked_jni_ThrowNew(JNIEnv *env,
632 Klass* k = jniCheck::validate_class(thr, clazz, false); 686 Klass* k = jniCheck::validate_class(thr, clazz, false);
633 assert(k != NULL, "validate_class shouldn't return NULL Klass*"); 687 assert(k != NULL, "validate_class shouldn't return NULL Klass*");
634 jniCheck::validate_throwable_klass(thr, k); 688 jniCheck::validate_throwable_klass(thr, k);
635 ) 689 )
636 jint result = UNCHECKED()->ThrowNew(env, clazz, msg); 690 jint result = UNCHECKED()->ThrowNew(env, clazz, msg);
637 functionExit(env); 691 functionExit(thr);
638 return result; 692 return result;
639 JNI_END 693 JNI_END
640 694
641 JNI_ENTRY_CHECKED(jthrowable, 695 JNI_ENTRY_CHECKED(jthrowable,
642 checked_jni_ExceptionOccurred(JNIEnv *env)) 696 checked_jni_ExceptionOccurred(JNIEnv *env))
697 thr->clear_pending_jni_exception_check();
643 functionEnterExceptionAllowed(thr); 698 functionEnterExceptionAllowed(thr);
644 jthrowable result = UNCHECKED()->ExceptionOccurred(env); 699 jthrowable result = UNCHECKED()->ExceptionOccurred(env);
645 functionExit(env); 700 functionExit(thr);
646 return result; 701 return result;
647 JNI_END 702 JNI_END
648 703
649 JNI_ENTRY_CHECKED(void, 704 JNI_ENTRY_CHECKED(void,
650 checked_jni_ExceptionDescribe(JNIEnv *env)) 705 checked_jni_ExceptionDescribe(JNIEnv *env))
651 functionEnterExceptionAllowed(thr); 706 functionEnterExceptionAllowed(thr);
652 UNCHECKED()->ExceptionDescribe(env); 707 UNCHECKED()->ExceptionDescribe(env);
653 functionExit(env); 708 functionExit(thr);
654 JNI_END 709 JNI_END
655 710
656 JNI_ENTRY_CHECKED(void, 711 JNI_ENTRY_CHECKED(void,
657 checked_jni_ExceptionClear(JNIEnv *env)) 712 checked_jni_ExceptionClear(JNIEnv *env))
713 thr->clear_pending_jni_exception_check();
658 functionEnterExceptionAllowed(thr); 714 functionEnterExceptionAllowed(thr);
659 UNCHECKED()->ExceptionClear(env); 715 UNCHECKED()->ExceptionClear(env);
660 functionExit(env); 716 functionExit(thr);
661 JNI_END 717 JNI_END
662 718
663 JNI_ENTRY_CHECKED(void, 719 JNI_ENTRY_CHECKED(void,
664 checked_jni_FatalError(JNIEnv *env, 720 checked_jni_FatalError(JNIEnv *env,
665 const char *msg)) 721 const char *msg))
722 thr->clear_pending_jni_exception_check();
666 functionEnter(thr); 723 functionEnter(thr);
667 UNCHECKED()->FatalError(env, msg); 724 UNCHECKED()->FatalError(env, msg);
668 functionExit(env); 725 functionExit(thr);
669 JNI_END 726 JNI_END
670 727
671 JNI_ENTRY_CHECKED(jint, 728 JNI_ENTRY_CHECKED(jint,
672 checked_jni_PushLocalFrame(JNIEnv *env, 729 checked_jni_PushLocalFrame(JNIEnv *env,
673 jint capacity)) 730 jint capacity))
674 functionEnterExceptionAllowed(thr); 731 functionEnterExceptionAllowed(thr);
675 if (capacity < 0) 732 if (capacity < 0)
676 NativeReportJNIFatalError(thr, "negative capacity"); 733 NativeReportJNIFatalError(thr, "negative capacity");
677 jint result = UNCHECKED()->PushLocalFrame(env, capacity); 734 jint result = UNCHECKED()->PushLocalFrame(env, capacity);
678 functionExit(env); 735 if (result == JNI_OK) {
736 add_planned_handle_capacity(thr->active_handles(), capacity);
737 }
738 functionExit(thr);
679 return result; 739 return result;
680 JNI_END 740 JNI_END
681 741
682 JNI_ENTRY_CHECKED(jobject, 742 JNI_ENTRY_CHECKED(jobject,
683 checked_jni_PopLocalFrame(JNIEnv *env, 743 checked_jni_PopLocalFrame(JNIEnv *env,
684 jobject result)) 744 jobject result))
685 functionEnterExceptionAllowed(thr); 745 functionEnterExceptionAllowed(thr);
686 jobject res = UNCHECKED()->PopLocalFrame(env, result); 746 jobject res = UNCHECKED()->PopLocalFrame(env, result);
687 functionExit(env); 747 functionExit(thr);
688 return res; 748 return res;
689 JNI_END 749 JNI_END
690 750
691 JNI_ENTRY_CHECKED(jobject, 751 JNI_ENTRY_CHECKED(jobject,
692 checked_jni_NewGlobalRef(JNIEnv *env, 752 checked_jni_NewGlobalRef(JNIEnv *env,
696 if (lobj != NULL) { 756 if (lobj != NULL) {
697 jniCheck::validate_handle(thr, lobj); 757 jniCheck::validate_handle(thr, lobj);
698 } 758 }
699 ) 759 )
700 jobject result = UNCHECKED()->NewGlobalRef(env,lobj); 760 jobject result = UNCHECKED()->NewGlobalRef(env,lobj);
701 functionExit(env); 761 functionExit(thr);
702 return result; 762 return result;
703 JNI_END 763 JNI_END
704 764
705 JNI_ENTRY_CHECKED(void, 765 JNI_ENTRY_CHECKED(void,
706 checked_jni_DeleteGlobalRef(JNIEnv *env, 766 checked_jni_DeleteGlobalRef(JNIEnv *env,
712 ReportJNIFatalError(thr, 772 ReportJNIFatalError(thr,
713 "Invalid global JNI handle passed to DeleteGlobalRef"); 773 "Invalid global JNI handle passed to DeleteGlobalRef");
714 } 774 }
715 ) 775 )
716 UNCHECKED()->DeleteGlobalRef(env,gref); 776 UNCHECKED()->DeleteGlobalRef(env,gref);
717 functionExit(env); 777 functionExit(thr);
718 JNI_END 778 JNI_END
719 779
720 JNI_ENTRY_CHECKED(void, 780 JNI_ENTRY_CHECKED(void,
721 checked_jni_DeleteLocalRef(JNIEnv *env, 781 checked_jni_DeleteLocalRef(JNIEnv *env,
722 jobject obj)) 782 jobject obj))
727 JNIHandles::is_frame_handle(thr, obj))) 787 JNIHandles::is_frame_handle(thr, obj)))
728 ReportJNIFatalError(thr, 788 ReportJNIFatalError(thr,
729 "Invalid local JNI handle passed to DeleteLocalRef"); 789 "Invalid local JNI handle passed to DeleteLocalRef");
730 ) 790 )
731 UNCHECKED()->DeleteLocalRef(env, obj); 791 UNCHECKED()->DeleteLocalRef(env, obj);
732 functionExit(env); 792 functionExit(thr);
733 JNI_END 793 JNI_END
734 794
735 JNI_ENTRY_CHECKED(jboolean, 795 JNI_ENTRY_CHECKED(jboolean,
736 checked_jni_IsSameObject(JNIEnv *env, 796 checked_jni_IsSameObject(JNIEnv *env,
737 jobject obj1, 797 jobject obj1,
748 if (obj2 != NULL && jniCheck::validate_handle(thr, obj2) != NULL) { 808 if (obj2 != NULL && jniCheck::validate_handle(thr, obj2) != NULL) {
749 jniCheck::validate_object(thr, obj2); 809 jniCheck::validate_object(thr, obj2);
750 } 810 }
751 ) 811 )
752 jboolean result = UNCHECKED()->IsSameObject(env,obj1,obj2); 812 jboolean result = UNCHECKED()->IsSameObject(env,obj1,obj2);
753 functionExit(env); 813 functionExit(thr);
754 return result; 814 return result;
755 JNI_END 815 JNI_END
756 816
757 JNI_ENTRY_CHECKED(jobject, 817 JNI_ENTRY_CHECKED(jobject,
758 checked_jni_NewLocalRef(JNIEnv *env, 818 checked_jni_NewLocalRef(JNIEnv *env,
762 if (ref != NULL) { 822 if (ref != NULL) {
763 jniCheck::validate_handle(thr, ref); 823 jniCheck::validate_handle(thr, ref);
764 } 824 }
765 ) 825 )
766 jobject result = UNCHECKED()->NewLocalRef(env, ref); 826 jobject result = UNCHECKED()->NewLocalRef(env, ref);
767 functionExit(env); 827 functionExit(thr);
768 return result; 828 return result;
769 JNI_END 829 JNI_END
770 830
771 JNI_ENTRY_CHECKED(jint, 831 JNI_ENTRY_CHECKED(jint,
772 checked_jni_EnsureLocalCapacity(JNIEnv *env, 832 checked_jni_EnsureLocalCapacity(JNIEnv *env,
774 functionEnter(thr); 834 functionEnter(thr);
775 if (capacity < 0) { 835 if (capacity < 0) {
776 NativeReportJNIFatalError(thr, "negative capacity"); 836 NativeReportJNIFatalError(thr, "negative capacity");
777 } 837 }
778 jint result = UNCHECKED()->EnsureLocalCapacity(env, capacity); 838 jint result = UNCHECKED()->EnsureLocalCapacity(env, capacity);
779 functionExit(env); 839 if (result == JNI_OK) {
840 add_planned_handle_capacity(thr->active_handles(), capacity);
841 }
842 functionExit(thr);
780 return result; 843 return result;
781 JNI_END 844 JNI_END
782 845
783 JNI_ENTRY_CHECKED(jobject, 846 JNI_ENTRY_CHECKED(jobject,
784 checked_jni_AllocObject(JNIEnv *env, 847 checked_jni_AllocObject(JNIEnv *env,
786 functionEnter(thr); 849 functionEnter(thr);
787 IN_VM( 850 IN_VM(
788 jniCheck::validate_class(thr, clazz, false); 851 jniCheck::validate_class(thr, clazz, false);
789 ) 852 )
790 jobject result = UNCHECKED()->AllocObject(env,clazz); 853 jobject result = UNCHECKED()->AllocObject(env,clazz);
791 functionExit(env); 854 functionExit(thr);
792 return result; 855 return result;
793 JNI_END 856 JNI_END
794 857
795 JNI_ENTRY_CHECKED(jobject, 858 JNI_ENTRY_CHECKED(jobject,
796 checked_jni_NewObject(JNIEnv *env, 859 checked_jni_NewObject(JNIEnv *env,
804 jniCheck::validate_jmethod_id(thr, methodID); 867 jniCheck::validate_jmethod_id(thr, methodID);
805 ) 868 )
806 va_start(args, methodID); 869 va_start(args, methodID);
807 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args); 870 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args);
808 va_end(args); 871 va_end(args);
809 functionExit(env); 872 functionExit(thr);
810 return result; 873 return result;
811 JNI_END 874 JNI_END
812 875
813 JNI_ENTRY_CHECKED(jobject, 876 JNI_ENTRY_CHECKED(jobject,
814 checked_jni_NewObjectV(JNIEnv *env, 877 checked_jni_NewObjectV(JNIEnv *env,
819 IN_VM( 882 IN_VM(
820 jniCheck::validate_class(thr, clazz, false); 883 jniCheck::validate_class(thr, clazz, false);
821 jniCheck::validate_jmethod_id(thr, methodID); 884 jniCheck::validate_jmethod_id(thr, methodID);
822 ) 885 )
823 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args); 886 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args);
824 functionExit(env); 887 functionExit(thr);
825 return result; 888 return result;
826 JNI_END 889 JNI_END
827 890
828 JNI_ENTRY_CHECKED(jobject, 891 JNI_ENTRY_CHECKED(jobject,
829 checked_jni_NewObjectA(JNIEnv *env, 892 checked_jni_NewObjectA(JNIEnv *env,
834 IN_VM( 897 IN_VM(
835 jniCheck::validate_class(thr, clazz, false); 898 jniCheck::validate_class(thr, clazz, false);
836 jniCheck::validate_jmethod_id(thr, methodID); 899 jniCheck::validate_jmethod_id(thr, methodID);
837 ) 900 )
838 jobject result = UNCHECKED()->NewObjectA(env,clazz,methodID,args); 901 jobject result = UNCHECKED()->NewObjectA(env,clazz,methodID,args);
839 functionExit(env); 902 functionExit(thr);
840 return result; 903 return result;
841 JNI_END 904 JNI_END
842 905
843 JNI_ENTRY_CHECKED(jclass, 906 JNI_ENTRY_CHECKED(jclass,
844 checked_jni_GetObjectClass(JNIEnv *env, 907 checked_jni_GetObjectClass(JNIEnv *env,
846 functionEnter(thr); 909 functionEnter(thr);
847 IN_VM( 910 IN_VM(
848 jniCheck::validate_object(thr, obj); 911 jniCheck::validate_object(thr, obj);
849 ) 912 )
850 jclass result = UNCHECKED()->GetObjectClass(env,obj); 913 jclass result = UNCHECKED()->GetObjectClass(env,obj);
851 functionExit(env); 914 functionExit(thr);
852 return result; 915 return result;
853 JNI_END 916 JNI_END
854 917
855 JNI_ENTRY_CHECKED(jboolean, 918 JNI_ENTRY_CHECKED(jboolean,
856 checked_jni_IsInstanceOf(JNIEnv *env, 919 checked_jni_IsInstanceOf(JNIEnv *env,
860 IN_VM( 923 IN_VM(
861 jniCheck::validate_object(thr, obj); 924 jniCheck::validate_object(thr, obj);
862 jniCheck::validate_class(thr, clazz, true); 925 jniCheck::validate_class(thr, clazz, true);
863 ) 926 )
864 jboolean result = UNCHECKED()->IsInstanceOf(env,obj,clazz); 927 jboolean result = UNCHECKED()->IsInstanceOf(env,obj,clazz);
865 functionExit(env); 928 functionExit(thr);
866 return result; 929 return result;
867 JNI_END 930 JNI_END
868 931
869 JNI_ENTRY_CHECKED(jmethodID, 932 JNI_ENTRY_CHECKED(jmethodID,
870 checked_jni_GetMethodID(JNIEnv *env, 933 checked_jni_GetMethodID(JNIEnv *env,
874 functionEnter(thr); 937 functionEnter(thr);
875 IN_VM( 938 IN_VM(
876 jniCheck::validate_class(thr, clazz, false); 939 jniCheck::validate_class(thr, clazz, false);
877 ) 940 )
878 jmethodID result = UNCHECKED()->GetMethodID(env,clazz,name,sig); 941 jmethodID result = UNCHECKED()->GetMethodID(env,clazz,name,sig);
879 functionExit(env); 942 functionExit(thr);
880 return result; 943 return result;
881 JNI_END 944 JNI_END
882 945
883 #define WRAPPER_CallMethod(ResultType, Result) \ 946 #define WRAPPER_CallMethod(ResultType, Result) \
884 JNI_ENTRY_CHECKED(ResultType, \ 947 JNI_ENTRY_CHECKED(ResultType, \
893 ) \ 956 ) \
894 va_start(args,methodID); \ 957 va_start(args,methodID); \
895 ResultType result =UNCHECKED()->Call##Result##MethodV(env, obj, methodID, \ 958 ResultType result =UNCHECKED()->Call##Result##MethodV(env, obj, methodID, \
896 args); \ 959 args); \
897 va_end(args); \ 960 va_end(args); \
898 functionExit(env); \ 961 thr->set_pending_jni_exception_check("Call"#Result"Method"); \
962 functionExit(thr); \
899 return result; \ 963 return result; \
900 JNI_END \ 964 JNI_END \
901 \ 965 \
902 JNI_ENTRY_CHECKED(ResultType, \ 966 JNI_ENTRY_CHECKED(ResultType, \
903 checked_jni_Call##Result##MethodV(JNIEnv *env, \ 967 checked_jni_Call##Result##MethodV(JNIEnv *env, \
908 IN_VM(\ 972 IN_VM(\
909 jniCheck::validate_call_object(thr, obj, methodID); \ 973 jniCheck::validate_call_object(thr, obj, methodID); \
910 ) \ 974 ) \
911 ResultType result = UNCHECKED()->Call##Result##MethodV(env, obj, methodID,\ 975 ResultType result = UNCHECKED()->Call##Result##MethodV(env, obj, methodID,\
912 args); \ 976 args); \
913 functionExit(env); \ 977 thr->set_pending_jni_exception_check("Call"#Result"MethodV"); \
978 functionExit(thr); \
914 return result; \ 979 return result; \
915 JNI_END \ 980 JNI_END \
916 \ 981 \
917 JNI_ENTRY_CHECKED(ResultType, \ 982 JNI_ENTRY_CHECKED(ResultType, \
918 checked_jni_Call##Result##MethodA(JNIEnv *env, \ 983 checked_jni_Call##Result##MethodA(JNIEnv *env, \
923 IN_VM( \ 988 IN_VM( \
924 jniCheck::validate_call_object(thr, obj, methodID); \ 989 jniCheck::validate_call_object(thr, obj, methodID); \
925 ) \ 990 ) \
926 ResultType result = UNCHECKED()->Call##Result##MethodA(env, obj, methodID,\ 991 ResultType result = UNCHECKED()->Call##Result##MethodA(env, obj, methodID,\
927 args); \ 992 args); \
928 functionExit(env); \ 993 thr->set_pending_jni_exception_check("Call"#Result"MethodA"); \
994 functionExit(thr); \
929 return result; \ 995 return result; \
930 JNI_END 996 JNI_END
931 997
932 WRAPPER_CallMethod(jobject,Object) 998 WRAPPER_CallMethod(jobject,Object)
933 WRAPPER_CallMethod(jboolean,Boolean) 999 WRAPPER_CallMethod(jboolean,Boolean)
950 jniCheck::validate_call_object(thr, obj, methodID); 1016 jniCheck::validate_call_object(thr, obj, methodID);
951 ) 1017 )
952 va_start(args,methodID); 1018 va_start(args,methodID);
953 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args); 1019 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args);
954 va_end(args); 1020 va_end(args);
955 functionExit(env); 1021 thr->set_pending_jni_exception_check("CallVoidMethod");
1022 functionExit(thr);
956 JNI_END 1023 JNI_END
957 1024
958 JNI_ENTRY_CHECKED(void, 1025 JNI_ENTRY_CHECKED(void,
959 checked_jni_CallVoidMethodV(JNIEnv *env, 1026 checked_jni_CallVoidMethodV(JNIEnv *env,
960 jobject obj, 1027 jobject obj,
963 functionEnter(thr); 1030 functionEnter(thr);
964 IN_VM( 1031 IN_VM(
965 jniCheck::validate_call_object(thr, obj, methodID); 1032 jniCheck::validate_call_object(thr, obj, methodID);
966 ) 1033 )
967 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args); 1034 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args);
968 functionExit(env); 1035 thr->set_pending_jni_exception_check("CallVoidMethodV");
1036 functionExit(thr);
969 JNI_END 1037 JNI_END
970 1038
971 JNI_ENTRY_CHECKED(void, 1039 JNI_ENTRY_CHECKED(void,
972 checked_jni_CallVoidMethodA(JNIEnv *env, 1040 checked_jni_CallVoidMethodA(JNIEnv *env,
973 jobject obj, 1041 jobject obj,
976 functionEnter(thr); 1044 functionEnter(thr);
977 IN_VM( 1045 IN_VM(
978 jniCheck::validate_call_object(thr, obj, methodID); 1046 jniCheck::validate_call_object(thr, obj, methodID);
979 ) 1047 )
980 UNCHECKED()->CallVoidMethodA(env,obj,methodID,args); 1048 UNCHECKED()->CallVoidMethodA(env,obj,methodID,args);
981 functionExit(env); 1049 thr->set_pending_jni_exception_check("CallVoidMethodA");
1050 functionExit(thr);
982 JNI_END 1051 JNI_END
983 1052
984 #define WRAPPER_CallNonvirtualMethod(ResultType, Result) \ 1053 #define WRAPPER_CallNonvirtualMethod(ResultType, Result) \
985 JNI_ENTRY_CHECKED(ResultType, \ 1054 JNI_ENTRY_CHECKED(ResultType, \
986 checked_jni_CallNonvirtual##Result##Method(JNIEnv *env, \ 1055 checked_jni_CallNonvirtual##Result##Method(JNIEnv *env, \
999 obj, \ 1068 obj, \
1000 clazz, \ 1069 clazz, \
1001 methodID,\ 1070 methodID,\
1002 args); \ 1071 args); \
1003 va_end(args); \ 1072 va_end(args); \
1004 functionExit(env); \ 1073 thr->set_pending_jni_exception_check("CallNonvirtual"#Result"Method"); \
1074 functionExit(thr); \
1005 return result; \ 1075 return result; \
1006 JNI_END \ 1076 JNI_END \
1007 \ 1077 \
1008 JNI_ENTRY_CHECKED(ResultType, \ 1078 JNI_ENTRY_CHECKED(ResultType, \
1009 checked_jni_CallNonvirtual##Result##MethodV(JNIEnv *env, \ 1079 checked_jni_CallNonvirtual##Result##MethodV(JNIEnv *env, \
1019 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodV(env, \ 1089 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodV(env, \
1020 obj, \ 1090 obj, \
1021 clazz, \ 1091 clazz, \
1022 methodID,\ 1092 methodID,\
1023 args); \ 1093 args); \
1024 functionExit(env); \ 1094 thr->set_pending_jni_exception_check("CallNonvirtual"#Result"MethodV"); \
1095 functionExit(thr); \
1025 return result; \ 1096 return result; \
1026 JNI_END \ 1097 JNI_END \
1027 \ 1098 \
1028 JNI_ENTRY_CHECKED(ResultType, \ 1099 JNI_ENTRY_CHECKED(ResultType, \
1029 checked_jni_CallNonvirtual##Result##MethodA(JNIEnv *env, \ 1100 checked_jni_CallNonvirtual##Result##MethodA(JNIEnv *env, \
1039 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodA(env, \ 1110 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodA(env, \
1040 obj, \ 1111 obj, \
1041 clazz, \ 1112 clazz, \
1042 methodID,\ 1113 methodID,\
1043 args); \ 1114 args); \
1044 functionExit(env); \ 1115 thr->set_pending_jni_exception_check("CallNonvirtual"#Result"MethodA"); \
1116 functionExit(thr); \
1045 return result; \ 1117 return result; \
1046 JNI_END 1118 JNI_END
1047 1119
1048 WRAPPER_CallNonvirtualMethod(jobject,Object) 1120 WRAPPER_CallNonvirtualMethod(jobject,Object)
1049 WRAPPER_CallNonvirtualMethod(jboolean,Boolean) 1121 WRAPPER_CallNonvirtualMethod(jboolean,Boolean)
1068 jniCheck::validate_call_class(thr, clazz, methodID); 1140 jniCheck::validate_call_class(thr, clazz, methodID);
1069 ) 1141 )
1070 va_start(args,methodID); 1142 va_start(args,methodID);
1071 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args); 1143 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args);
1072 va_end(args); 1144 va_end(args);
1073 functionExit(env); 1145 thr->set_pending_jni_exception_check("CallNonvirtualVoidMethod");
1146 functionExit(thr);
1074 JNI_END 1147 JNI_END
1075 1148
1076 JNI_ENTRY_CHECKED(void, 1149 JNI_ENTRY_CHECKED(void,
1077 checked_jni_CallNonvirtualVoidMethodV(JNIEnv *env, 1150 checked_jni_CallNonvirtualVoidMethodV(JNIEnv *env,
1078 jobject obj, 1151 jobject obj,
1083 IN_VM( 1156 IN_VM(
1084 jniCheck::validate_call_object(thr, obj, methodID); 1157 jniCheck::validate_call_object(thr, obj, methodID);
1085 jniCheck::validate_call_class(thr, clazz, methodID); 1158 jniCheck::validate_call_class(thr, clazz, methodID);
1086 ) 1159 )
1087 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args); 1160 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args);
1088 functionExit(env); 1161 thr->set_pending_jni_exception_check("CallNonvirtualVoidMethodV");
1162 functionExit(thr);
1089 JNI_END 1163 JNI_END
1090 1164
1091 JNI_ENTRY_CHECKED(void, 1165 JNI_ENTRY_CHECKED(void,
1092 checked_jni_CallNonvirtualVoidMethodA(JNIEnv *env, 1166 checked_jni_CallNonvirtualVoidMethodA(JNIEnv *env,
1093 jobject obj, 1167 jobject obj,
1098 IN_VM( 1172 IN_VM(
1099 jniCheck::validate_call_object(thr, obj, methodID); 1173 jniCheck::validate_call_object(thr, obj, methodID);
1100 jniCheck::validate_call_class(thr, clazz, methodID); 1174 jniCheck::validate_call_class(thr, clazz, methodID);
1101 ) 1175 )
1102 UNCHECKED()->CallNonvirtualVoidMethodA(env,obj,clazz,methodID,args); 1176 UNCHECKED()->CallNonvirtualVoidMethodA(env,obj,clazz,methodID,args);
1103 functionExit(env); 1177 thr->set_pending_jni_exception_check("CallNonvirtualVoidMethodA");
1178 functionExit(thr);
1104 JNI_END 1179 JNI_END
1105 1180
1106 JNI_ENTRY_CHECKED(jfieldID, 1181 JNI_ENTRY_CHECKED(jfieldID,
1107 checked_jni_GetFieldID(JNIEnv *env, 1182 checked_jni_GetFieldID(JNIEnv *env,
1108 jclass clazz, 1183 jclass clazz,
1111 functionEnter(thr); 1186 functionEnter(thr);
1112 IN_VM( 1187 IN_VM(
1113 jniCheck::validate_class(thr, clazz, false); 1188 jniCheck::validate_class(thr, clazz, false);
1114 ) 1189 )
1115 jfieldID result = UNCHECKED()->GetFieldID(env,clazz,name,sig); 1190 jfieldID result = UNCHECKED()->GetFieldID(env,clazz,name,sig);
1116 functionExit(env); 1191 functionExit(thr);
1117 return result; 1192 return result;
1118 JNI_END 1193 JNI_END
1119 1194
1120 #define WRAPPER_GetField(ReturnType,Result,FieldType) \ 1195 #define WRAPPER_GetField(ReturnType,Result,FieldType) \
1121 JNI_ENTRY_CHECKED(ReturnType, \ 1196 JNI_ENTRY_CHECKED(ReturnType, \
1125 functionEnter(thr); \ 1200 functionEnter(thr); \
1126 IN_VM( \ 1201 IN_VM( \
1127 checkInstanceFieldID(thr, fieldID, obj, FieldType); \ 1202 checkInstanceFieldID(thr, fieldID, obj, FieldType); \
1128 ) \ 1203 ) \
1129 ReturnType result = UNCHECKED()->Get##Result##Field(env,obj,fieldID); \ 1204 ReturnType result = UNCHECKED()->Get##Result##Field(env,obj,fieldID); \
1130 functionExit(env); \ 1205 functionExit(thr); \
1131 return result; \ 1206 return result; \
1132 JNI_END 1207 JNI_END
1133 1208
1134 WRAPPER_GetField(jobject, Object, T_OBJECT) 1209 WRAPPER_GetField(jobject, Object, T_OBJECT)
1135 WRAPPER_GetField(jboolean, Boolean, T_BOOLEAN) 1210 WRAPPER_GetField(jboolean, Boolean, T_BOOLEAN)
1150 functionEnter(thr); \ 1225 functionEnter(thr); \
1151 IN_VM( \ 1226 IN_VM( \
1152 checkInstanceFieldID(thr, fieldID, obj, FieldType); \ 1227 checkInstanceFieldID(thr, fieldID, obj, FieldType); \
1153 ) \ 1228 ) \
1154 UNCHECKED()->Set##Result##Field(env,obj,fieldID,val); \ 1229 UNCHECKED()->Set##Result##Field(env,obj,fieldID,val); \
1155 functionExit(env); \ 1230 functionExit(thr); \
1156 JNI_END 1231 JNI_END
1157 1232
1158 WRAPPER_SetField(jobject, Object, T_OBJECT) 1233 WRAPPER_SetField(jobject, Object, T_OBJECT)
1159 WRAPPER_SetField(jboolean, Boolean, T_BOOLEAN) 1234 WRAPPER_SetField(jboolean, Boolean, T_BOOLEAN)
1160 WRAPPER_SetField(jbyte, Byte, T_BYTE) 1235 WRAPPER_SetField(jbyte, Byte, T_BYTE)
1174 functionEnter(thr); 1249 functionEnter(thr);
1175 IN_VM( 1250 IN_VM(
1176 jniCheck::validate_class(thr, clazz, false); 1251 jniCheck::validate_class(thr, clazz, false);
1177 ) 1252 )
1178 jmethodID result = UNCHECKED()->GetStaticMethodID(env,clazz,name,sig); 1253 jmethodID result = UNCHECKED()->GetStaticMethodID(env,clazz,name,sig);
1179 functionExit(env); 1254 functionExit(thr);
1180 return result; 1255 return result;
1181 JNI_END 1256 JNI_END
1182 1257
1183 #define WRAPPER_CallStaticMethod(ReturnType,Result) \ 1258 #define WRAPPER_CallStaticMethod(ReturnType,Result) \
1184 JNI_ENTRY_CHECKED(ReturnType, \ 1259 JNI_ENTRY_CHECKED(ReturnType, \
1196 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \ 1271 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \
1197 clazz, \ 1272 clazz, \
1198 methodID, \ 1273 methodID, \
1199 args); \ 1274 args); \
1200 va_end(args); \ 1275 va_end(args); \
1201 functionExit(env); \ 1276 thr->set_pending_jni_exception_check("CallStatic"#Result"Method"); \
1277 functionExit(thr); \
1202 return result; \ 1278 return result; \
1203 JNI_END \ 1279 JNI_END \
1204 \ 1280 \
1205 JNI_ENTRY_CHECKED(ReturnType, \ 1281 JNI_ENTRY_CHECKED(ReturnType, \
1206 checked_jni_CallStatic##Result##MethodV(JNIEnv *env, \ 1282 checked_jni_CallStatic##Result##MethodV(JNIEnv *env, \
1214 ) \ 1290 ) \
1215 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \ 1291 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \
1216 clazz, \ 1292 clazz, \
1217 methodID, \ 1293 methodID, \
1218 args); \ 1294 args); \
1219 functionExit(env); \ 1295 thr->set_pending_jni_exception_check("CallStatic"#Result"MethodV"); \
1296 functionExit(thr); \
1220 return result; \ 1297 return result; \
1221 JNI_END \ 1298 JNI_END \
1222 \ 1299 \
1223 JNI_ENTRY_CHECKED(ReturnType, \ 1300 JNI_ENTRY_CHECKED(ReturnType, \
1224 checked_jni_CallStatic##Result##MethodA(JNIEnv *env, \ 1301 checked_jni_CallStatic##Result##MethodA(JNIEnv *env, \
1232 ) \ 1309 ) \
1233 ReturnType result = UNCHECKED()->CallStatic##Result##MethodA(env, \ 1310 ReturnType result = UNCHECKED()->CallStatic##Result##MethodA(env, \
1234 clazz, \ 1311 clazz, \
1235 methodID, \ 1312 methodID, \
1236 args); \ 1313 args); \
1237 functionExit(env); \ 1314 thr->set_pending_jni_exception_check("CallStatic"#Result"MethodA"); \
1315 functionExit(thr); \
1238 return result; \ 1316 return result; \
1239 JNI_END 1317 JNI_END
1240 1318
1241 WRAPPER_CallStaticMethod(jobject,Object) 1319 WRAPPER_CallStaticMethod(jobject,Object)
1242 WRAPPER_CallStaticMethod(jboolean,Boolean) 1320 WRAPPER_CallStaticMethod(jboolean,Boolean)
1260 jniCheck::validate_class(thr, cls, false); 1338 jniCheck::validate_class(thr, cls, false);
1261 ) 1339 )
1262 va_start(args,methodID); 1340 va_start(args,methodID);
1263 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args); 1341 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args);
1264 va_end(args); 1342 va_end(args);
1265 functionExit(env); 1343 thr->set_pending_jni_exception_check("CallStaticVoidMethod");
1344 functionExit(thr);
1266 JNI_END 1345 JNI_END
1267 1346
1268 JNI_ENTRY_CHECKED(void, 1347 JNI_ENTRY_CHECKED(void,
1269 checked_jni_CallStaticVoidMethodV(JNIEnv *env, 1348 checked_jni_CallStaticVoidMethodV(JNIEnv *env,
1270 jclass cls, 1349 jclass cls,
1274 IN_VM( 1353 IN_VM(
1275 jniCheck::validate_jmethod_id(thr, methodID); 1354 jniCheck::validate_jmethod_id(thr, methodID);
1276 jniCheck::validate_class(thr, cls, false); 1355 jniCheck::validate_class(thr, cls, false);
1277 ) 1356 )
1278 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args); 1357 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args);
1279 functionExit(env); 1358 thr->set_pending_jni_exception_check("CallStaticVoidMethodV");
1359 functionExit(thr);
1280 JNI_END 1360 JNI_END
1281 1361
1282 JNI_ENTRY_CHECKED(void, 1362 JNI_ENTRY_CHECKED(void,
1283 checked_jni_CallStaticVoidMethodA(JNIEnv *env, 1363 checked_jni_CallStaticVoidMethodA(JNIEnv *env,
1284 jclass cls, 1364 jclass cls,
1288 IN_VM( 1368 IN_VM(
1289 jniCheck::validate_jmethod_id(thr, methodID); 1369 jniCheck::validate_jmethod_id(thr, methodID);
1290 jniCheck::validate_class(thr, cls, false); 1370 jniCheck::validate_class(thr, cls, false);
1291 ) 1371 )
1292 UNCHECKED()->CallStaticVoidMethodA(env,cls,methodID,args); 1372 UNCHECKED()->CallStaticVoidMethodA(env,cls,methodID,args);
1293 functionExit(env); 1373 thr->set_pending_jni_exception_check("CallStaticVoidMethodA");
1374 functionExit(thr);
1294 JNI_END 1375 JNI_END
1295 1376
1296 JNI_ENTRY_CHECKED(jfieldID, 1377 JNI_ENTRY_CHECKED(jfieldID,
1297 checked_jni_GetStaticFieldID(JNIEnv *env, 1378 checked_jni_GetStaticFieldID(JNIEnv *env,
1298 jclass clazz, 1379 jclass clazz,
1301 functionEnter(thr); 1382 functionEnter(thr);
1302 IN_VM( 1383 IN_VM(
1303 jniCheck::validate_class(thr, clazz, false); 1384 jniCheck::validate_class(thr, clazz, false);
1304 ) 1385 )
1305 jfieldID result = UNCHECKED()->GetStaticFieldID(env,clazz,name,sig); 1386 jfieldID result = UNCHECKED()->GetStaticFieldID(env,clazz,name,sig);
1306 functionExit(env); 1387 functionExit(thr);
1307 return result; 1388 return result;
1308 JNI_END 1389 JNI_END
1309 1390
1310 #define WRAPPER_GetStaticField(ReturnType,Result,FieldType) \ 1391 #define WRAPPER_GetStaticField(ReturnType,Result,FieldType) \
1311 JNI_ENTRY_CHECKED(ReturnType, \ 1392 JNI_ENTRY_CHECKED(ReturnType, \
1318 checkStaticFieldID(thr, fieldID, clazz, FieldType); \ 1399 checkStaticFieldID(thr, fieldID, clazz, FieldType); \
1319 ) \ 1400 ) \
1320 ReturnType result = UNCHECKED()->GetStatic##Result##Field(env, \ 1401 ReturnType result = UNCHECKED()->GetStatic##Result##Field(env, \
1321 clazz, \ 1402 clazz, \
1322 fieldID); \ 1403 fieldID); \
1323 functionExit(env); \ 1404 functionExit(thr); \
1324 return result; \ 1405 return result; \
1325 JNI_END 1406 JNI_END
1326 1407
1327 WRAPPER_GetStaticField(jobject, Object, T_OBJECT) 1408 WRAPPER_GetStaticField(jobject, Object, T_OBJECT)
1328 WRAPPER_GetStaticField(jboolean, Boolean, T_BOOLEAN) 1409 WRAPPER_GetStaticField(jboolean, Boolean, T_BOOLEAN)
1344 IN_VM( \ 1425 IN_VM( \
1345 jniCheck::validate_class(thr, clazz, false); \ 1426 jniCheck::validate_class(thr, clazz, false); \
1346 checkStaticFieldID(thr, fieldID, clazz, FieldType); \ 1427 checkStaticFieldID(thr, fieldID, clazz, FieldType); \
1347 ) \ 1428 ) \
1348 UNCHECKED()->SetStatic##Result##Field(env,clazz,fieldID,value); \ 1429 UNCHECKED()->SetStatic##Result##Field(env,clazz,fieldID,value); \
1349 functionExit(env); \ 1430 functionExit(thr); \
1350 JNI_END 1431 JNI_END
1351 1432
1352 WRAPPER_SetStaticField(jobject, Object, T_OBJECT) 1433 WRAPPER_SetStaticField(jobject, Object, T_OBJECT)
1353 WRAPPER_SetStaticField(jboolean, Boolean, T_BOOLEAN) 1434 WRAPPER_SetStaticField(jboolean, Boolean, T_BOOLEAN)
1354 WRAPPER_SetStaticField(jbyte, Byte, T_BYTE) 1435 WRAPPER_SetStaticField(jbyte, Byte, T_BYTE)
1364 checked_jni_NewString(JNIEnv *env, 1445 checked_jni_NewString(JNIEnv *env,
1365 const jchar *unicode, 1446 const jchar *unicode,
1366 jsize len)) 1447 jsize len))
1367 functionEnter(thr); 1448 functionEnter(thr);
1368 jstring result = UNCHECKED()->NewString(env,unicode,len); 1449 jstring result = UNCHECKED()->NewString(env,unicode,len);
1369 functionExit(env); 1450 functionExit(thr);
1370 return result; 1451 return result;
1371 JNI_END 1452 JNI_END
1372 1453
1373 JNI_ENTRY_CHECKED(jsize, 1454 JNI_ENTRY_CHECKED(jsize,
1374 checked_jni_GetStringLength(JNIEnv *env, 1455 checked_jni_GetStringLength(JNIEnv *env,
1376 functionEnter(thr); 1457 functionEnter(thr);
1377 IN_VM( 1458 IN_VM(
1378 checkString(thr, str); 1459 checkString(thr, str);
1379 ) 1460 )
1380 jsize result = UNCHECKED()->GetStringLength(env,str); 1461 jsize result = UNCHECKED()->GetStringLength(env,str);
1381 functionExit(env); 1462 functionExit(thr);
1382 return result; 1463 return result;
1383 JNI_END 1464 JNI_END
1384 1465
1385 // Arbitrary (but well-known) tag 1466 // Arbitrary (but well-known) tag
1386 const void* STRING_TAG = (void*)0x47114711; 1467 const void* STRING_TAG = (void*)0x47114711;
1405 } 1486 }
1406 // Avoiding call to UNCHECKED()->ReleaseStringChars() since that will fire unexpected dtrace probes 1487 // Avoiding call to UNCHECKED()->ReleaseStringChars() since that will fire unexpected dtrace probes
1407 // Note that the dtrace arguments for the allocated memory will not match up with this solution. 1488 // Note that the dtrace arguments for the allocated memory will not match up with this solution.
1408 FreeHeap((char*)result); 1489 FreeHeap((char*)result);
1409 } 1490 }
1410 functionExit(env); 1491 functionExit(thr);
1411 return new_result; 1492 return new_result;
1412 JNI_END 1493 JNI_END
1413 1494
1414 JNI_ENTRY_CHECKED(void, 1495 JNI_ENTRY_CHECKED(void,
1415 checked_jni_ReleaseStringChars(JNIEnv *env, 1496 checked_jni_ReleaseStringChars(JNIEnv *env,
1440 "not allocated by GetStringChars"); 1521 "not allocated by GetStringChars");
1441 } 1522 }
1442 UNCHECKED()->ReleaseStringChars(env, str, 1523 UNCHECKED()->ReleaseStringChars(env, str,
1443 (const jchar*) guarded.release_for_freeing()); 1524 (const jchar*) guarded.release_for_freeing());
1444 } 1525 }
1445 functionExit(env); 1526 functionExit(thr);
1446 JNI_END 1527 JNI_END
1447 1528
1448 JNI_ENTRY_CHECKED(jstring, 1529 JNI_ENTRY_CHECKED(jstring,
1449 checked_jni_NewStringUTF(JNIEnv *env, 1530 checked_jni_NewStringUTF(JNIEnv *env,
1450 const char *utf)) 1531 const char *utf))
1451 functionEnter(thr); 1532 functionEnter(thr);
1452 jstring result = UNCHECKED()->NewStringUTF(env,utf); 1533 jstring result = UNCHECKED()->NewStringUTF(env,utf);
1453 functionExit(env); 1534 functionExit(thr);
1454 return result; 1535 return result;
1455 JNI_END 1536 JNI_END
1456 1537
1457 JNI_ENTRY_CHECKED(jsize, 1538 JNI_ENTRY_CHECKED(jsize,
1458 checked_jni_GetStringUTFLength(JNIEnv *env, 1539 checked_jni_GetStringUTFLength(JNIEnv *env,
1460 functionEnter(thr); 1541 functionEnter(thr);
1461 IN_VM( 1542 IN_VM(
1462 checkString(thr, str); 1543 checkString(thr, str);
1463 ) 1544 )
1464 jsize result = UNCHECKED()->GetStringUTFLength(env,str); 1545 jsize result = UNCHECKED()->GetStringUTFLength(env,str);
1465 functionExit(env); 1546 functionExit(thr);
1466 return result; 1547 return result;
1467 JNI_END 1548 JNI_END
1468 1549
1469 // Arbitrary (but well-known) tag - different than GetStringChars 1550 // Arbitrary (but well-known) tag - different than GetStringChars
1470 const void* STRING_UTF_TAG = (void*) 0x48124812; 1551 const void* STRING_UTF_TAG = (void*) 0x48124812;
1488 } 1569 }
1489 // Avoiding call to UNCHECKED()->ReleaseStringUTFChars() since that will fire unexpected dtrace probes 1570 // Avoiding call to UNCHECKED()->ReleaseStringUTFChars() since that will fire unexpected dtrace probes
1490 // Note that the dtrace arguments for the allocated memory will not match up with this solution. 1571 // Note that the dtrace arguments for the allocated memory will not match up with this solution.
1491 FreeHeap((char*)result, mtInternal); 1572 FreeHeap((char*)result, mtInternal);
1492 } 1573 }
1493 functionExit(env); 1574 functionExit(thr);
1494 return new_result; 1575 return new_result;
1495 JNI_END 1576 JNI_END
1496 1577
1497 JNI_ENTRY_CHECKED(void, 1578 JNI_ENTRY_CHECKED(void,
1498 checked_jni_ReleaseStringUTFChars(JNIEnv *env, 1579 checked_jni_ReleaseStringUTFChars(JNIEnv *env,
1523 "called on something not allocated by GetStringUTFChars"); 1604 "called on something not allocated by GetStringUTFChars");
1524 } 1605 }
1525 UNCHECKED()->ReleaseStringUTFChars(env, str, 1606 UNCHECKED()->ReleaseStringUTFChars(env, str,
1526 (const char*) guarded.release_for_freeing()); 1607 (const char*) guarded.release_for_freeing());
1527 } 1608 }
1528 functionExit(env); 1609 functionExit(thr);
1529 JNI_END 1610 JNI_END
1530 1611
1531 JNI_ENTRY_CHECKED(jsize, 1612 JNI_ENTRY_CHECKED(jsize,
1532 checked_jni_GetArrayLength(JNIEnv *env, 1613 checked_jni_GetArrayLength(JNIEnv *env,
1533 jarray array)) 1614 jarray array))
1534 functionEnter(thr); 1615 functionEnter(thr);
1535 IN_VM( 1616 IN_VM(
1536 check_is_array(thr, array); 1617 check_is_array(thr, array);
1537 ) 1618 )
1538 jsize result = UNCHECKED()->GetArrayLength(env,array); 1619 jsize result = UNCHECKED()->GetArrayLength(env,array);
1539 functionExit(env); 1620 functionExit(thr);
1540 return result; 1621 return result;
1541 JNI_END 1622 JNI_END
1542 1623
1543 JNI_ENTRY_CHECKED(jobjectArray, 1624 JNI_ENTRY_CHECKED(jobjectArray,
1544 checked_jni_NewObjectArray(JNIEnv *env, 1625 checked_jni_NewObjectArray(JNIEnv *env,
1545 jsize len, 1626 jsize len,
1546 jclass clazz, 1627 jclass clazz,
1547 jobject init)) 1628 jobject init))
1548 functionEnter(thr); 1629 functionEnter(thr);
1549 jobjectArray result = UNCHECKED()->NewObjectArray(env,len,clazz,init); 1630 jobjectArray result = UNCHECKED()->NewObjectArray(env,len,clazz,init);
1550 functionExit(env); 1631 functionExit(thr);
1551 return result; 1632 return result;
1552 JNI_END 1633 JNI_END
1553 1634
1554 JNI_ENTRY_CHECKED(jobject, 1635 JNI_ENTRY_CHECKED(jobject,
1555 checked_jni_GetObjectArrayElement(JNIEnv *env, 1636 checked_jni_GetObjectArrayElement(JNIEnv *env,
1558 functionEnter(thr); 1639 functionEnter(thr);
1559 IN_VM( 1640 IN_VM(
1560 check_is_obj_array(thr, array); 1641 check_is_obj_array(thr, array);
1561 ) 1642 )
1562 jobject result = UNCHECKED()->GetObjectArrayElement(env,array,index); 1643 jobject result = UNCHECKED()->GetObjectArrayElement(env,array,index);
1563 functionExit(env); 1644 functionExit(thr);
1564 return result; 1645 return result;
1565 JNI_END 1646 JNI_END
1566 1647
1567 JNI_ENTRY_CHECKED(void, 1648 JNI_ENTRY_CHECKED(void,
1568 checked_jni_SetObjectArrayElement(JNIEnv *env, 1649 checked_jni_SetObjectArrayElement(JNIEnv *env,
1572 functionEnter(thr); 1653 functionEnter(thr);
1573 IN_VM( 1654 IN_VM(
1574 check_is_obj_array(thr, array); 1655 check_is_obj_array(thr, array);
1575 ) 1656 )
1576 UNCHECKED()->SetObjectArrayElement(env,array,index,val); 1657 UNCHECKED()->SetObjectArrayElement(env,array,index,val);
1577 functionExit(env); 1658 functionExit(thr);
1578 JNI_END 1659 JNI_END
1579 1660
1580 #define WRAPPER_NewScalarArray(Return, Result) \ 1661 #define WRAPPER_NewScalarArray(Return, Result) \
1581 JNI_ENTRY_CHECKED(Return, \ 1662 JNI_ENTRY_CHECKED(Return, \
1582 checked_jni_New##Result##Array(JNIEnv *env, \ 1663 checked_jni_New##Result##Array(JNIEnv *env, \
1583 jsize len)) \ 1664 jsize len)) \
1584 functionEnter(thr); \ 1665 functionEnter(thr); \
1585 Return result = UNCHECKED()->New##Result##Array(env,len); \ 1666 Return result = UNCHECKED()->New##Result##Array(env,len); \
1586 functionExit(env); \ 1667 functionExit(thr); \
1587 return (Return) result; \ 1668 return (Return) result; \
1588 JNI_END 1669 JNI_END
1589 1670
1590 WRAPPER_NewScalarArray(jbooleanArray, Boolean) 1671 WRAPPER_NewScalarArray(jbooleanArray, Boolean)
1591 WRAPPER_NewScalarArray(jbyteArray, Byte) 1672 WRAPPER_NewScalarArray(jbyteArray, Byte)
1609 array, \ 1690 array, \
1610 isCopy); \ 1691 isCopy); \
1611 if (result != NULL) { \ 1692 if (result != NULL) { \
1612 result = (ElementType *) check_jni_wrap_copy_array(thr, array, result); \ 1693 result = (ElementType *) check_jni_wrap_copy_array(thr, array, result); \
1613 } \ 1694 } \
1614 functionExit(env); \ 1695 functionExit(thr); \
1615 return result; \ 1696 return result; \
1616 JNI_END 1697 JNI_END
1617 1698
1618 WRAPPER_GetScalarArrayElements(T_BOOLEAN, jboolean, Boolean) 1699 WRAPPER_GetScalarArrayElements(T_BOOLEAN, jboolean, Boolean)
1619 WRAPPER_GetScalarArrayElements(T_BYTE, jbyte, Byte) 1700 WRAPPER_GetScalarArrayElements(T_BYTE, jbyte, Byte)
1637 typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \ 1718 typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
1638 ) \ 1719 ) \
1639 ElementType* orig_result = (ElementType *) check_wrapped_array_release( \ 1720 ElementType* orig_result = (ElementType *) check_wrapped_array_release( \
1640 thr, "checked_jni_Release"#Result"ArrayElements", array, elems, mode); \ 1721 thr, "checked_jni_Release"#Result"ArrayElements", array, elems, mode); \
1641 UNCHECKED()->Release##Result##ArrayElements(env, array, orig_result, mode); \ 1722 UNCHECKED()->Release##Result##ArrayElements(env, array, orig_result, mode); \
1642 functionExit(env); \ 1723 functionExit(thr); \
1643 JNI_END 1724 JNI_END
1644 1725
1645 WRAPPER_ReleaseScalarArrayElements(T_BOOLEAN,jboolean, Boolean, bool) 1726 WRAPPER_ReleaseScalarArrayElements(T_BOOLEAN,jboolean, Boolean, bool)
1646 WRAPPER_ReleaseScalarArrayElements(T_BYTE, jbyte, Byte, byte) 1727 WRAPPER_ReleaseScalarArrayElements(T_BYTE, jbyte, Byte, byte)
1647 WRAPPER_ReleaseScalarArrayElements(T_SHORT, jshort, Short, short) 1728 WRAPPER_ReleaseScalarArrayElements(T_SHORT, jshort, Short, short)
1661 functionEnter(thr); \ 1742 functionEnter(thr); \
1662 IN_VM( \ 1743 IN_VM( \
1663 check_primitive_array_type(thr, array, ElementTag); \ 1744 check_primitive_array_type(thr, array, ElementTag); \
1664 ) \ 1745 ) \
1665 UNCHECKED()->Get##Result##ArrayRegion(env,array,start,len,buf); \ 1746 UNCHECKED()->Get##Result##ArrayRegion(env,array,start,len,buf); \
1666 functionExit(env); \ 1747 functionExit(thr); \
1667 JNI_END 1748 JNI_END
1668 1749
1669 WRAPPER_GetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean) 1750 WRAPPER_GetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean)
1670 WRAPPER_GetScalarArrayRegion(T_BYTE, jbyte, Byte) 1751 WRAPPER_GetScalarArrayRegion(T_BYTE, jbyte, Byte)
1671 WRAPPER_GetScalarArrayRegion(T_SHORT, jshort, Short) 1752 WRAPPER_GetScalarArrayRegion(T_SHORT, jshort, Short)
1685 functionEnter(thr); \ 1766 functionEnter(thr); \
1686 IN_VM( \ 1767 IN_VM( \
1687 check_primitive_array_type(thr, array, ElementTag); \ 1768 check_primitive_array_type(thr, array, ElementTag); \
1688 ) \ 1769 ) \
1689 UNCHECKED()->Set##Result##ArrayRegion(env,array,start,len,buf); \ 1770 UNCHECKED()->Set##Result##ArrayRegion(env,array,start,len,buf); \
1690 functionExit(env); \ 1771 functionExit(thr); \
1691 JNI_END 1772 JNI_END
1692 1773
1693 WRAPPER_SetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean) 1774 WRAPPER_SetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean)
1694 WRAPPER_SetScalarArrayRegion(T_BYTE, jbyte, Byte) 1775 WRAPPER_SetScalarArrayRegion(T_BYTE, jbyte, Byte)
1695 WRAPPER_SetScalarArrayRegion(T_SHORT, jshort, Short) 1776 WRAPPER_SetScalarArrayRegion(T_SHORT, jshort, Short)
1704 jclass clazz, 1785 jclass clazz,
1705 const JNINativeMethod *methods, 1786 const JNINativeMethod *methods,
1706 jint nMethods)) 1787 jint nMethods))
1707 functionEnter(thr); 1788 functionEnter(thr);
1708 jint result = UNCHECKED()->RegisterNatives(env,clazz,methods,nMethods); 1789 jint result = UNCHECKED()->RegisterNatives(env,clazz,methods,nMethods);
1709 functionExit(env); 1790 functionExit(thr);
1710 return result; 1791 return result;
1711 JNI_END 1792 JNI_END
1712 1793
1713 JNI_ENTRY_CHECKED(jint, 1794 JNI_ENTRY_CHECKED(jint,
1714 checked_jni_UnregisterNatives(JNIEnv *env, 1795 checked_jni_UnregisterNatives(JNIEnv *env,
1715 jclass clazz)) 1796 jclass clazz))
1716 functionEnter(thr); 1797 functionEnter(thr);
1717 jint result = UNCHECKED()->UnregisterNatives(env,clazz); 1798 jint result = UNCHECKED()->UnregisterNatives(env,clazz);
1718 functionExit(env); 1799 functionExit(thr);
1719 return result; 1800 return result;
1720 JNI_END 1801 JNI_END
1721 1802
1722 JNI_ENTRY_CHECKED(jint, 1803 JNI_ENTRY_CHECKED(jint,
1723 checked_jni_MonitorEnter(JNIEnv *env, 1804 checked_jni_MonitorEnter(JNIEnv *env,
1725 functionEnter(thr); 1806 functionEnter(thr);
1726 IN_VM( 1807 IN_VM(
1727 jniCheck::validate_object(thr, obj); 1808 jniCheck::validate_object(thr, obj);
1728 ) 1809 )
1729 jint result = UNCHECKED()->MonitorEnter(env,obj); 1810 jint result = UNCHECKED()->MonitorEnter(env,obj);
1730 functionExit(env); 1811 functionExit(thr);
1731 return result; 1812 return result;
1732 JNI_END 1813 JNI_END
1733 1814
1734 JNI_ENTRY_CHECKED(jint, 1815 JNI_ENTRY_CHECKED(jint,
1735 checked_jni_MonitorExit(JNIEnv *env, 1816 checked_jni_MonitorExit(JNIEnv *env,
1737 functionEnterExceptionAllowed(thr); 1818 functionEnterExceptionAllowed(thr);
1738 IN_VM( 1819 IN_VM(
1739 jniCheck::validate_object(thr, obj); 1820 jniCheck::validate_object(thr, obj);
1740 ) 1821 )
1741 jint result = UNCHECKED()->MonitorExit(env,obj); 1822 jint result = UNCHECKED()->MonitorExit(env,obj);
1742 functionExit(env); 1823 functionExit(thr);
1743 return result; 1824 return result;
1744 JNI_END 1825 JNI_END
1745 1826
1746 JNI_ENTRY_CHECKED(jint, 1827 JNI_ENTRY_CHECKED(jint,
1747 checked_jni_GetJavaVM(JNIEnv *env, 1828 checked_jni_GetJavaVM(JNIEnv *env,
1748 JavaVM **vm)) 1829 JavaVM **vm))
1749 functionEnter(thr); 1830 functionEnter(thr);
1750 jint result = UNCHECKED()->GetJavaVM(env,vm); 1831 jint result = UNCHECKED()->GetJavaVM(env,vm);
1751 functionExit(env); 1832 functionExit(thr);
1752 return result; 1833 return result;
1753 JNI_END 1834 JNI_END
1754 1835
1755 JNI_ENTRY_CHECKED(void, 1836 JNI_ENTRY_CHECKED(void,
1756 checked_jni_GetStringRegion(JNIEnv *env, 1837 checked_jni_GetStringRegion(JNIEnv *env,
1761 functionEnter(thr); 1842 functionEnter(thr);
1762 IN_VM( 1843 IN_VM(
1763 checkString(thr, str); 1844 checkString(thr, str);
1764 ) 1845 )
1765 UNCHECKED()->GetStringRegion(env, str, start, len, buf); 1846 UNCHECKED()->GetStringRegion(env, str, start, len, buf);
1766 functionExit(env); 1847 functionExit(thr);
1767 JNI_END 1848 JNI_END
1768 1849
1769 JNI_ENTRY_CHECKED(void, 1850 JNI_ENTRY_CHECKED(void,
1770 checked_jni_GetStringUTFRegion(JNIEnv *env, 1851 checked_jni_GetStringUTFRegion(JNIEnv *env,
1771 jstring str, 1852 jstring str,
1775 functionEnter(thr); 1856 functionEnter(thr);
1776 IN_VM( 1857 IN_VM(
1777 checkString(thr, str); 1858 checkString(thr, str);
1778 ) 1859 )
1779 UNCHECKED()->GetStringUTFRegion(env, str, start, len, buf); 1860 UNCHECKED()->GetStringUTFRegion(env, str, start, len, buf);
1780 functionExit(env); 1861 functionExit(thr);
1781 JNI_END 1862 JNI_END
1782 1863
1783 JNI_ENTRY_CHECKED(void *, 1864 JNI_ENTRY_CHECKED(void *,
1784 checked_jni_GetPrimitiveArrayCritical(JNIEnv *env, 1865 checked_jni_GetPrimitiveArrayCritical(JNIEnv *env,
1785 jarray array, 1866 jarray array,
1790 ) 1871 )
1791 void *result = UNCHECKED()->GetPrimitiveArrayCritical(env, array, isCopy); 1872 void *result = UNCHECKED()->GetPrimitiveArrayCritical(env, array, isCopy);
1792 if (result != NULL) { 1873 if (result != NULL) {
1793 result = check_jni_wrap_copy_array(thr, array, result); 1874 result = check_jni_wrap_copy_array(thr, array, result);
1794 } 1875 }
1795 functionExit(env); 1876 functionExit(thr);
1796 return result; 1877 return result;
1797 JNI_END 1878 JNI_END
1798 1879
1799 JNI_ENTRY_CHECKED(void, 1880 JNI_ENTRY_CHECKED(void,
1800 checked_jni_ReleasePrimitiveArrayCritical(JNIEnv *env, 1881 checked_jni_ReleasePrimitiveArrayCritical(JNIEnv *env,
1806 check_is_primitive_array(thr, array); 1887 check_is_primitive_array(thr, array);
1807 ) 1888 )
1808 // Check the element array... 1889 // Check the element array...
1809 void* orig_result = check_wrapped_array_release(thr, "ReleasePrimitiveArrayCritical", array, carray, mode); 1890 void* orig_result = check_wrapped_array_release(thr, "ReleasePrimitiveArrayCritical", array, carray, mode);
1810 UNCHECKED()->ReleasePrimitiveArrayCritical(env, array, orig_result, mode); 1891 UNCHECKED()->ReleasePrimitiveArrayCritical(env, array, orig_result, mode);
1811 functionExit(env); 1892 functionExit(thr);
1812 JNI_END 1893 JNI_END
1813 1894
1814 JNI_ENTRY_CHECKED(const jchar*, 1895 JNI_ENTRY_CHECKED(const jchar*,
1815 checked_jni_GetStringCritical(JNIEnv *env, 1896 checked_jni_GetStringCritical(JNIEnv *env,
1816 jstring string, 1897 jstring string,
1818 functionEnterCritical(thr); 1899 functionEnterCritical(thr);
1819 IN_VM( 1900 IN_VM(
1820 checkString(thr, string); 1901 checkString(thr, string);
1821 ) 1902 )
1822 const jchar *result = UNCHECKED()->GetStringCritical(env, string, isCopy); 1903 const jchar *result = UNCHECKED()->GetStringCritical(env, string, isCopy);
1823 functionExit(env); 1904 functionExit(thr);
1824 return result; 1905 return result;
1825 JNI_END 1906 JNI_END
1826 1907
1827 JNI_ENTRY_CHECKED(void, 1908 JNI_ENTRY_CHECKED(void,
1828 checked_jni_ReleaseStringCritical(JNIEnv *env, 1909 checked_jni_ReleaseStringCritical(JNIEnv *env,
1834 ) 1915 )
1835 /* The Hotspot JNI code does not use the parameters, so just check the 1916 /* The Hotspot JNI code does not use the parameters, so just check the
1836 * string parameter as a minor sanity check 1917 * string parameter as a minor sanity check
1837 */ 1918 */
1838 UNCHECKED()->ReleaseStringCritical(env, str, chars); 1919 UNCHECKED()->ReleaseStringCritical(env, str, chars);
1839 functionExit(env); 1920 functionExit(thr);
1840 JNI_END 1921 JNI_END
1841 1922
1842 JNI_ENTRY_CHECKED(jweak, 1923 JNI_ENTRY_CHECKED(jweak,
1843 checked_jni_NewWeakGlobalRef(JNIEnv *env, 1924 checked_jni_NewWeakGlobalRef(JNIEnv *env,
1844 jobject obj)) 1925 jobject obj))
1847 if (obj != NULL) { 1928 if (obj != NULL) {
1848 jniCheck::validate_handle(thr, obj); 1929 jniCheck::validate_handle(thr, obj);
1849 } 1930 }
1850 ) 1931 )
1851 jweak result = UNCHECKED()->NewWeakGlobalRef(env, obj); 1932 jweak result = UNCHECKED()->NewWeakGlobalRef(env, obj);
1852 functionExit(env); 1933 functionExit(thr);
1853 return result; 1934 return result;
1854 JNI_END 1935 JNI_END
1855 1936
1856 JNI_ENTRY_CHECKED(void, 1937 JNI_ENTRY_CHECKED(void,
1857 checked_jni_DeleteWeakGlobalRef(JNIEnv *env, 1938 checked_jni_DeleteWeakGlobalRef(JNIEnv *env,
1858 jweak ref)) 1939 jweak ref))
1859 functionEnterExceptionAllowed(thr); 1940 functionEnterExceptionAllowed(thr);
1860 UNCHECKED()->DeleteWeakGlobalRef(env, ref); 1941 UNCHECKED()->DeleteWeakGlobalRef(env, ref);
1861 functionExit(env); 1942 functionExit(thr);
1862 JNI_END 1943 JNI_END
1863 1944
1864 JNI_ENTRY_CHECKED(jboolean, 1945 JNI_ENTRY_CHECKED(jboolean,
1865 checked_jni_ExceptionCheck(JNIEnv *env)) 1946 checked_jni_ExceptionCheck(JNIEnv *env))
1947 thr->clear_pending_jni_exception_check();
1866 functionEnterExceptionAllowed(thr); 1948 functionEnterExceptionAllowed(thr);
1867 jboolean result = UNCHECKED()->ExceptionCheck(env); 1949 jboolean result = UNCHECKED()->ExceptionCheck(env);
1868 functionExit(env); 1950 functionExit(thr);
1869 return result; 1951 return result;
1870 JNI_END 1952 JNI_END
1871 1953
1872 JNI_ENTRY_CHECKED(jobject, 1954 JNI_ENTRY_CHECKED(jobject,
1873 checked_jni_NewDirectByteBuffer(JNIEnv *env, 1955 checked_jni_NewDirectByteBuffer(JNIEnv *env,
1874 void *address, 1956 void *address,
1875 jlong capacity)) 1957 jlong capacity))
1876 functionEnter(thr); 1958 functionEnter(thr);
1877 jobject result = UNCHECKED()->NewDirectByteBuffer(env, address, capacity); 1959 jobject result = UNCHECKED()->NewDirectByteBuffer(env, address, capacity);
1878 functionExit(env); 1960 functionExit(thr);
1879 return result; 1961 return result;
1880 JNI_END 1962 JNI_END
1881 1963
1882 JNI_ENTRY_CHECKED(void *, 1964 JNI_ENTRY_CHECKED(void *,
1883 checked_jni_GetDirectBufferAddress(JNIEnv *env, 1965 checked_jni_GetDirectBufferAddress(JNIEnv *env,
1884 jobject buf)) 1966 jobject buf))
1885 functionEnter(thr); 1967 functionEnter(thr);
1886 void* result = UNCHECKED()->GetDirectBufferAddress(env, buf); 1968 void* result = UNCHECKED()->GetDirectBufferAddress(env, buf);
1887 functionExit(env); 1969 functionExit(thr);
1888 return result; 1970 return result;
1889 JNI_END 1971 JNI_END
1890 1972
1891 JNI_ENTRY_CHECKED(jlong, 1973 JNI_ENTRY_CHECKED(jlong,
1892 checked_jni_GetDirectBufferCapacity(JNIEnv *env, 1974 checked_jni_GetDirectBufferCapacity(JNIEnv *env,
1893 jobject buf)) 1975 jobject buf))
1894 functionEnter(thr); 1976 functionEnter(thr);
1895 jlong result = UNCHECKED()->GetDirectBufferCapacity(env, buf); 1977 jlong result = UNCHECKED()->GetDirectBufferCapacity(env, buf);
1896 functionExit(env); 1978 functionExit(thr);
1897 return result; 1979 return result;
1898 JNI_END 1980 JNI_END
1899 1981
1900 JNI_ENTRY_CHECKED(jobjectRefType, 1982 JNI_ENTRY_CHECKED(jobjectRefType,
1901 checked_jni_GetObjectRefType(JNIEnv *env, 1983 checked_jni_GetObjectRefType(JNIEnv *env,
1904 /* validate the object being passed */ 1986 /* validate the object being passed */
1905 IN_VM( 1987 IN_VM(
1906 jniCheck::validate_object(thr, obj); 1988 jniCheck::validate_object(thr, obj);
1907 ) 1989 )
1908 jobjectRefType result = UNCHECKED()->GetObjectRefType(env, obj); 1990 jobjectRefType result = UNCHECKED()->GetObjectRefType(env, obj);
1909 functionExit(env); 1991 functionExit(thr);
1910 return result; 1992 return result;
1911 JNI_END 1993 JNI_END
1912 1994
1913 1995
1914 JNI_ENTRY_CHECKED(jint, 1996 JNI_ENTRY_CHECKED(jint,
1915 checked_jni_GetVersion(JNIEnv *env)) 1997 checked_jni_GetVersion(JNIEnv *env))
1916 functionEnter(thr); 1998 functionEnter(thr);
1917 jint result = UNCHECKED()->GetVersion(env); 1999 jint result = UNCHECKED()->GetVersion(env);
1918 functionExit(env); 2000 functionExit(thr);
1919 return result; 2001 return result;
1920 JNI_END 2002 JNI_END
1921 2003
1922 2004
1923 2005