Mercurial > hg > graal-jvmci-8

comparison src/share/vm/prims/jniCheck.cpp @ 22877:d68158e12cea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8043224: -Xcheck:jni improvements to exception checking and excessive local refs Summary: Warning when not checking exceptions from function that require so, also when local refs expand beyond capacity. Reviewed-by: dsimms
author poonam
date Wed, 11 Mar 2015 13:36:57 -0700
parents 29a5c2fd2d2e
children 9904bb920313
comparison
equal deleted inserted replaced
22876:364f6c28effb 22877:d68158e12cea
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 static inline void
190 check_pending_exception(JavaThread* thr) {
191 if (thr->has_pending_exception()) {
192 NativeReportJNIWarning(thr, "JNI call made with exception pending");
193 }
194 if (thr->is_pending_jni_exception_check()) {
195 IN_VM(
196 tty->print_cr("WARNING in native method: JNI call made without checking exceptions when required to from %s",
197 thr->get_pending_jni_exception_check());
198 thr->print_stack();
199 )
200 thr->clear_pending_jni_exception_check(); // Just complain once
201 }
202 }
203
204
171 static inline void 205 static inline void
172 functionEnterCritical(JavaThread* thr) 206 functionEnterCritical(JavaThread* thr)
173 { 207 {
174 if (thr->has_pending_exception()) { 208 check_pending_exception(thr);
175 NativeReportJNIWarning(thr, "JNI call made with exception pending");
176 }
177 } 209 }
178 210
179 static inline void 211 static inline void
180 functionEnterCriticalExceptionAllowed(JavaThread* thr) 212 functionEnterCriticalExceptionAllowed(JavaThread* thr)
181 { 213 {
185 functionEnter(JavaThread* thr) 217 functionEnter(JavaThread* thr)
186 { 218 {
187 if (thr->in_critical()) { 219 if (thr->in_critical()) {
188 tty->print_cr("%s", warn_other_function_in_critical); 220 tty->print_cr("%s", warn_other_function_in_critical);
189 } 221 }
190 if (thr->has_pending_exception()) { 222 check_pending_exception(thr);
191 NativeReportJNIWarning(thr, "JNI call made with exception pending");
192 }
193 } 223 }
194 224
195 static inline void 225 static inline void
196 functionEnterExceptionAllowed(JavaThread* thr) 226 functionEnterExceptionAllowed(JavaThread* thr)
197 { 227 {
199 tty->print_cr("%s", warn_other_function_in_critical); 229 tty->print_cr("%s", warn_other_function_in_critical);
200 } 230 }
201 } 231 }
202 232
203 static inline void 233 static inline void
204 functionExit(JNIEnv *env) 234 functionExit(JavaThread* thr)
205 { 235 {
206 /* nothing to do at this time */ 236 JNIHandleBlock* handles = thr->active_handles();
237 size_t planned_capacity = handles->get_planned_capacity();
238 size_t live_handles = handles->get_number_of_live_handles();
239 if (live_handles > planned_capacity) {
240 IN_VM(
241 tty->print_cr("WARNING: JNI local refs: %zu, exceeds capacity: %zu",
242 live_handles, planned_capacity);
243 thr->print_stack();
244 )
245 // Complain just the once, reset to current + warn threshold
246 handles->set_planned_capacity(live_handles + CHECK_JNI_LOCAL_REF_CAP_WARN_THRESHOLD);
247 }
207 } 248 }
208 249
209 static inline void 250 static inline void
210 checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype) 251 checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype)
211 { 252 {
506 functionEnter(thr); 547 functionEnter(thr);
507 IN_VM( 548 IN_VM(
508 jniCheck::validate_object(thr, loader); 549 jniCheck::validate_object(thr, loader);
509 ) 550 )
510 jclass result = UNCHECKED()->DefineClass(env, name, loader, buf, len); 551 jclass result = UNCHECKED()->DefineClass(env, name, loader, buf, len);
511 functionExit(env); 552 functionExit(thr);
512 return result; 553 return result;
513 JNI_END 554 JNI_END
514 555
515 JNI_ENTRY_CHECKED(jclass, 556 JNI_ENTRY_CHECKED(jclass,
516 checked_jni_FindClass(JNIEnv *env, 557 checked_jni_FindClass(JNIEnv *env,
518 functionEnter(thr); 559 functionEnter(thr);
519 IN_VM( 560 IN_VM(
520 jniCheck::validate_class_descriptor(thr, name); 561 jniCheck::validate_class_descriptor(thr, name);
521 ) 562 )
522 jclass result = UNCHECKED()->FindClass(env, name); 563 jclass result = UNCHECKED()->FindClass(env, name);
523 functionExit(env); 564 functionExit(thr);
524 return result; 565 return result;
525 JNI_END 566 JNI_END
526 567
527 JNI_ENTRY_CHECKED(jmethodID, 568 JNI_ENTRY_CHECKED(jmethodID,
528 checked_jni_FromReflectedMethod(JNIEnv *env, 569 checked_jni_FromReflectedMethod(JNIEnv *env,
530 functionEnter(thr); 571 functionEnter(thr);
531 IN_VM( 572 IN_VM(
532 jniCheck::validate_object(thr, method); 573 jniCheck::validate_object(thr, method);
533 ) 574 )
534 jmethodID result = UNCHECKED()->FromReflectedMethod(env, method); 575 jmethodID result = UNCHECKED()->FromReflectedMethod(env, method);
535 functionExit(env); 576 functionExit(thr);
536 return result; 577 return result;
537 JNI_END 578 JNI_END
538 579
539 JNI_ENTRY_CHECKED(jfieldID, 580 JNI_ENTRY_CHECKED(jfieldID,
540 checked_jni_FromReflectedField(JNIEnv *env, 581 checked_jni_FromReflectedField(JNIEnv *env,
542 functionEnter(thr); 583 functionEnter(thr);
543 IN_VM( 584 IN_VM(
544 jniCheck::validate_object(thr, field); 585 jniCheck::validate_object(thr, field);
545 ) 586 )
546 jfieldID result = UNCHECKED()->FromReflectedField(env, field); 587 jfieldID result = UNCHECKED()->FromReflectedField(env, field);
547 functionExit(env); 588 functionExit(thr);
548 return result; 589 return result;
549 JNI_END 590 JNI_END
550 591
551 JNI_ENTRY_CHECKED(jobject, 592 JNI_ENTRY_CHECKED(jobject,
552 checked_jni_ToReflectedMethod(JNIEnv *env, 593 checked_jni_ToReflectedMethod(JNIEnv *env,
558 jniCheck::validate_class(thr, cls, false); 599 jniCheck::validate_class(thr, cls, false);
559 jniCheck::validate_jmethod_id(thr, methodID); 600 jniCheck::validate_jmethod_id(thr, methodID);
560 ) 601 )
561 jobject result = UNCHECKED()->ToReflectedMethod(env, cls, methodID, 602 jobject result = UNCHECKED()->ToReflectedMethod(env, cls, methodID,
562 isStatic); 603 isStatic);
563 functionExit(env); 604 functionExit(thr);
564 return result; 605 return result;
565 JNI_END 606 JNI_END
566 607
567 JNI_ENTRY_CHECKED(jclass, 608 JNI_ENTRY_CHECKED(jclass,
568 checked_jni_GetSuperclass(JNIEnv *env, 609 checked_jni_GetSuperclass(JNIEnv *env,
570 functionEnter(thr); 611 functionEnter(thr);
571 IN_VM( 612 IN_VM(
572 jniCheck::validate_class(thr, sub, true); 613 jniCheck::validate_class(thr, sub, true);
573 ) 614 )
574 jclass result = UNCHECKED()->GetSuperclass(env, sub); 615 jclass result = UNCHECKED()->GetSuperclass(env, sub);
575 functionExit(env); 616 functionExit(thr);
576 return result; 617 return result;
577 JNI_END 618 JNI_END
578 619
579 JNI_ENTRY_CHECKED(jboolean, 620 JNI_ENTRY_CHECKED(jboolean,
580 checked_jni_IsAssignableFrom(JNIEnv *env, 621 checked_jni_IsAssignableFrom(JNIEnv *env,
584 IN_VM( 625 IN_VM(
585 jniCheck::validate_class(thr, sub, true); 626 jniCheck::validate_class(thr, sub, true);
586 jniCheck::validate_class(thr, sup, true); 627 jniCheck::validate_class(thr, sup, true);
587 ) 628 )
588 jboolean result = UNCHECKED()->IsAssignableFrom(env, sub, sup); 629 jboolean result = UNCHECKED()->IsAssignableFrom(env, sub, sup);
589 functionExit(env); 630 functionExit(thr);
590 return result; 631 return result;
591 JNI_END 632 JNI_END
592 633
593 JNI_ENTRY_CHECKED(jobject, 634 JNI_ENTRY_CHECKED(jobject,
594 checked_jni_ToReflectedField(JNIEnv *env, 635 checked_jni_ToReflectedField(JNIEnv *env,
599 IN_VM( 640 IN_VM(
600 jniCheck::validate_class(thr, cls, false); 641 jniCheck::validate_class(thr, cls, false);
601 ) 642 )
602 jobject result = UNCHECKED()->ToReflectedField(env, cls, fieldID, 643 jobject result = UNCHECKED()->ToReflectedField(env, cls, fieldID,
603 isStatic); 644 isStatic);
604 functionExit(env); 645 functionExit(thr);
605 return result; 646 return result;
606 JNI_END 647 JNI_END
607 648
608 JNI_ENTRY_CHECKED(jint, 649 JNI_ENTRY_CHECKED(jint,
609 checked_jni_Throw(JNIEnv *env, 650 checked_jni_Throw(JNIEnv *env,
617 } else { 658 } else {
618 jniCheck::validate_throwable_klass(thr, oopObj->klass()); 659 jniCheck::validate_throwable_klass(thr, oopObj->klass());
619 } 660 }
620 ) 661 )
621 jint result = UNCHECKED()->Throw(env, obj); 662 jint result = UNCHECKED()->Throw(env, obj);
622 functionExit(env); 663 functionExit(thr);
623 return result; 664 return result;
624 JNI_END 665 JNI_END
625 666
626 JNI_ENTRY_CHECKED(jint, 667 JNI_ENTRY_CHECKED(jint,
627 checked_jni_ThrowNew(JNIEnv *env, 668 checked_jni_ThrowNew(JNIEnv *env,
632 Klass* k = jniCheck::validate_class(thr, clazz, false); 673 Klass* k = jniCheck::validate_class(thr, clazz, false);
633 assert(k != NULL, "validate_class shouldn't return NULL Klass*"); 674 assert(k != NULL, "validate_class shouldn't return NULL Klass*");
634 jniCheck::validate_throwable_klass(thr, k); 675 jniCheck::validate_throwable_klass(thr, k);
635 ) 676 )
636 jint result = UNCHECKED()->ThrowNew(env, clazz, msg); 677 jint result = UNCHECKED()->ThrowNew(env, clazz, msg);
637 functionExit(env); 678 functionExit(thr);
638 return result; 679 return result;
639 JNI_END 680 JNI_END
640 681
641 JNI_ENTRY_CHECKED(jthrowable, 682 JNI_ENTRY_CHECKED(jthrowable,
642 checked_jni_ExceptionOccurred(JNIEnv *env)) 683 checked_jni_ExceptionOccurred(JNIEnv *env))
684 thr->clear_pending_jni_exception_check();
643 functionEnterExceptionAllowed(thr); 685 functionEnterExceptionAllowed(thr);
644 jthrowable result = UNCHECKED()->ExceptionOccurred(env); 686 jthrowable result = UNCHECKED()->ExceptionOccurred(env);
645 functionExit(env); 687 functionExit(thr);
646 return result; 688 return result;
647 JNI_END 689 JNI_END
648 690
649 JNI_ENTRY_CHECKED(void, 691 JNI_ENTRY_CHECKED(void,
650 checked_jni_ExceptionDescribe(JNIEnv *env)) 692 checked_jni_ExceptionDescribe(JNIEnv *env))
651 functionEnterExceptionAllowed(thr); 693 functionEnterExceptionAllowed(thr);
652 UNCHECKED()->ExceptionDescribe(env); 694 UNCHECKED()->ExceptionDescribe(env);
653 functionExit(env); 695 functionExit(thr);
654 JNI_END 696 JNI_END
655 697
656 JNI_ENTRY_CHECKED(void, 698 JNI_ENTRY_CHECKED(void,
657 checked_jni_ExceptionClear(JNIEnv *env)) 699 checked_jni_ExceptionClear(JNIEnv *env))
700 thr->clear_pending_jni_exception_check();
658 functionEnterExceptionAllowed(thr); 701 functionEnterExceptionAllowed(thr);
659 UNCHECKED()->ExceptionClear(env); 702 UNCHECKED()->ExceptionClear(env);
660 functionExit(env); 703 functionExit(thr);
661 JNI_END 704 JNI_END
662 705
663 JNI_ENTRY_CHECKED(void, 706 JNI_ENTRY_CHECKED(void,
664 checked_jni_FatalError(JNIEnv *env, 707 checked_jni_FatalError(JNIEnv *env,
665 const char *msg)) 708 const char *msg))
709 thr->clear_pending_jni_exception_check();
666 functionEnter(thr); 710 functionEnter(thr);
667 UNCHECKED()->FatalError(env, msg); 711 UNCHECKED()->FatalError(env, msg);
668 functionExit(env); 712 functionExit(thr);
669 JNI_END 713 JNI_END
670 714
671 JNI_ENTRY_CHECKED(jint, 715 JNI_ENTRY_CHECKED(jint,
672 checked_jni_PushLocalFrame(JNIEnv *env, 716 checked_jni_PushLocalFrame(JNIEnv *env,
673 jint capacity)) 717 jint capacity))
674 functionEnterExceptionAllowed(thr); 718 functionEnterExceptionAllowed(thr);
675 if (capacity < 0) 719 if (capacity < 0)
676 NativeReportJNIFatalError(thr, "negative capacity"); 720 NativeReportJNIFatalError(thr, "negative capacity");
677 jint result = UNCHECKED()->PushLocalFrame(env, capacity); 721 jint result = UNCHECKED()->PushLocalFrame(env, capacity);
678 functionExit(env); 722 if (result == JNI_OK) {
723 thr->active_handles()->set_planned_capacity(capacity + CHECK_JNI_LOCAL_REF_CAP_WARN_THRESHOLD);
724 }
725 functionExit(thr);
679 return result; 726 return result;
680 JNI_END 727 JNI_END
681 728
682 JNI_ENTRY_CHECKED(jobject, 729 JNI_ENTRY_CHECKED(jobject,
683 checked_jni_PopLocalFrame(JNIEnv *env, 730 checked_jni_PopLocalFrame(JNIEnv *env,
684 jobject result)) 731 jobject result))
685 functionEnterExceptionAllowed(thr); 732 functionEnterExceptionAllowed(thr);
686 jobject res = UNCHECKED()->PopLocalFrame(env, result); 733 jobject res = UNCHECKED()->PopLocalFrame(env, result);
687 functionExit(env); 734 functionExit(thr);
688 return res; 735 return res;
689 JNI_END 736 JNI_END
690 737
691 JNI_ENTRY_CHECKED(jobject, 738 JNI_ENTRY_CHECKED(jobject,
692 checked_jni_NewGlobalRef(JNIEnv *env, 739 checked_jni_NewGlobalRef(JNIEnv *env,
696 if (lobj != NULL) { 743 if (lobj != NULL) {
697 jniCheck::validate_handle(thr, lobj); 744 jniCheck::validate_handle(thr, lobj);
698 } 745 }
699 ) 746 )
700 jobject result = UNCHECKED()->NewGlobalRef(env,lobj); 747 jobject result = UNCHECKED()->NewGlobalRef(env,lobj);
701 functionExit(env); 748 functionExit(thr);
702 return result; 749 return result;
703 JNI_END 750 JNI_END
704 751
705 JNI_ENTRY_CHECKED(void, 752 JNI_ENTRY_CHECKED(void,
706 checked_jni_DeleteGlobalRef(JNIEnv *env, 753 checked_jni_DeleteGlobalRef(JNIEnv *env,
712 ReportJNIFatalError(thr, 759 ReportJNIFatalError(thr,
713 "Invalid global JNI handle passed to DeleteGlobalRef"); 760 "Invalid global JNI handle passed to DeleteGlobalRef");
714 } 761 }
715 ) 762 )
716 UNCHECKED()->DeleteGlobalRef(env,gref); 763 UNCHECKED()->DeleteGlobalRef(env,gref);
717 functionExit(env); 764 functionExit(thr);
718 JNI_END 765 JNI_END
719 766
720 JNI_ENTRY_CHECKED(void, 767 JNI_ENTRY_CHECKED(void,
721 checked_jni_DeleteLocalRef(JNIEnv *env, 768 checked_jni_DeleteLocalRef(JNIEnv *env,
722 jobject obj)) 769 jobject obj))
727 JNIHandles::is_frame_handle(thr, obj))) 774 JNIHandles::is_frame_handle(thr, obj)))
728 ReportJNIFatalError(thr, 775 ReportJNIFatalError(thr,
729 "Invalid local JNI handle passed to DeleteLocalRef"); 776 "Invalid local JNI handle passed to DeleteLocalRef");
730 ) 777 )
731 UNCHECKED()->DeleteLocalRef(env, obj); 778 UNCHECKED()->DeleteLocalRef(env, obj);
732 functionExit(env); 779 functionExit(thr);
733 JNI_END 780 JNI_END
734 781
735 JNI_ENTRY_CHECKED(jboolean, 782 JNI_ENTRY_CHECKED(jboolean,
736 checked_jni_IsSameObject(JNIEnv *env, 783 checked_jni_IsSameObject(JNIEnv *env,
737 jobject obj1, 784 jobject obj1,
748 if (obj2 != NULL && jniCheck::validate_handle(thr, obj2) != NULL) { 795 if (obj2 != NULL && jniCheck::validate_handle(thr, obj2) != NULL) {
749 jniCheck::validate_object(thr, obj2); 796 jniCheck::validate_object(thr, obj2);
750 } 797 }
751 ) 798 )
752 jboolean result = UNCHECKED()->IsSameObject(env,obj1,obj2); 799 jboolean result = UNCHECKED()->IsSameObject(env,obj1,obj2);
753 functionExit(env); 800 functionExit(thr);
754 return result; 801 return result;
755 JNI_END 802 JNI_END
756 803
757 JNI_ENTRY_CHECKED(jobject, 804 JNI_ENTRY_CHECKED(jobject,
758 checked_jni_NewLocalRef(JNIEnv *env, 805 checked_jni_NewLocalRef(JNIEnv *env,
762 if (ref != NULL) { 809 if (ref != NULL) {
763 jniCheck::validate_handle(thr, ref); 810 jniCheck::validate_handle(thr, ref);
764 } 811 }
765 ) 812 )
766 jobject result = UNCHECKED()->NewLocalRef(env, ref); 813 jobject result = UNCHECKED()->NewLocalRef(env, ref);
767 functionExit(env); 814 functionExit(thr);
768 return result; 815 return result;
769 JNI_END 816 JNI_END
770 817
771 JNI_ENTRY_CHECKED(jint, 818 JNI_ENTRY_CHECKED(jint,
772 checked_jni_EnsureLocalCapacity(JNIEnv *env, 819 checked_jni_EnsureLocalCapacity(JNIEnv *env,
774 functionEnter(thr); 821 functionEnter(thr);
775 if (capacity < 0) { 822 if (capacity < 0) {
776 NativeReportJNIFatalError(thr, "negative capacity"); 823 NativeReportJNIFatalError(thr, "negative capacity");
777 } 824 }
778 jint result = UNCHECKED()->EnsureLocalCapacity(env, capacity); 825 jint result = UNCHECKED()->EnsureLocalCapacity(env, capacity);
779 functionExit(env); 826 if (result == JNI_OK) {
827 thr->active_handles()->set_planned_capacity(capacity + CHECK_JNI_LOCAL_REF_CAP_WARN_THRESHOLD);
828 }
829 functionExit(thr);
780 return result; 830 return result;
781 JNI_END 831 JNI_END
782 832
783 JNI_ENTRY_CHECKED(jobject, 833 JNI_ENTRY_CHECKED(jobject,
784 checked_jni_AllocObject(JNIEnv *env, 834 checked_jni_AllocObject(JNIEnv *env,
786 functionEnter(thr); 836 functionEnter(thr);
787 IN_VM( 837 IN_VM(
788 jniCheck::validate_class(thr, clazz, false); 838 jniCheck::validate_class(thr, clazz, false);
789 ) 839 )
790 jobject result = UNCHECKED()->AllocObject(env,clazz); 840 jobject result = UNCHECKED()->AllocObject(env,clazz);
791 functionExit(env); 841 functionExit(thr);
792 return result; 842 return result;
793 JNI_END 843 JNI_END
794 844
795 JNI_ENTRY_CHECKED(jobject, 845 JNI_ENTRY_CHECKED(jobject,
796 checked_jni_NewObject(JNIEnv *env, 846 checked_jni_NewObject(JNIEnv *env,
804 jniCheck::validate_jmethod_id(thr, methodID); 854 jniCheck::validate_jmethod_id(thr, methodID);
805 ) 855 )
806 va_start(args, methodID); 856 va_start(args, methodID);
807 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args); 857 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args);
808 va_end(args); 858 va_end(args);
809 functionExit(env); 859 functionExit(thr);
810 return result; 860 return result;
811 JNI_END 861 JNI_END
812 862
813 JNI_ENTRY_CHECKED(jobject, 863 JNI_ENTRY_CHECKED(jobject,
814 checked_jni_NewObjectV(JNIEnv *env, 864 checked_jni_NewObjectV(JNIEnv *env,
819 IN_VM( 869 IN_VM(
820 jniCheck::validate_class(thr, clazz, false); 870 jniCheck::validate_class(thr, clazz, false);
821 jniCheck::validate_jmethod_id(thr, methodID); 871 jniCheck::validate_jmethod_id(thr, methodID);
822 ) 872 )
823 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args); 873 jobject result = UNCHECKED()->NewObjectV(env,clazz,methodID,args);
824 functionExit(env); 874 functionExit(thr);
825 return result; 875 return result;
826 JNI_END 876 JNI_END
827 877
828 JNI_ENTRY_CHECKED(jobject, 878 JNI_ENTRY_CHECKED(jobject,
829 checked_jni_NewObjectA(JNIEnv *env, 879 checked_jni_NewObjectA(JNIEnv *env,
834 IN_VM( 884 IN_VM(
835 jniCheck::validate_class(thr, clazz, false); 885 jniCheck::validate_class(thr, clazz, false);
836 jniCheck::validate_jmethod_id(thr, methodID); 886 jniCheck::validate_jmethod_id(thr, methodID);
837 ) 887 )
838 jobject result = UNCHECKED()->NewObjectA(env,clazz,methodID,args); 888 jobject result = UNCHECKED()->NewObjectA(env,clazz,methodID,args);
839 functionExit(env); 889 functionExit(thr);
840 return result; 890 return result;
841 JNI_END 891 JNI_END
842 892
843 JNI_ENTRY_CHECKED(jclass, 893 JNI_ENTRY_CHECKED(jclass,
844 checked_jni_GetObjectClass(JNIEnv *env, 894 checked_jni_GetObjectClass(JNIEnv *env,
846 functionEnter(thr); 896 functionEnter(thr);
847 IN_VM( 897 IN_VM(
848 jniCheck::validate_object(thr, obj); 898 jniCheck::validate_object(thr, obj);
849 ) 899 )
850 jclass result = UNCHECKED()->GetObjectClass(env,obj); 900 jclass result = UNCHECKED()->GetObjectClass(env,obj);
851 functionExit(env); 901 functionExit(thr);
852 return result; 902 return result;
853 JNI_END 903 JNI_END
854 904
855 JNI_ENTRY_CHECKED(jboolean, 905 JNI_ENTRY_CHECKED(jboolean,
856 checked_jni_IsInstanceOf(JNIEnv *env, 906 checked_jni_IsInstanceOf(JNIEnv *env,
860 IN_VM( 910 IN_VM(
861 jniCheck::validate_object(thr, obj); 911 jniCheck::validate_object(thr, obj);
862 jniCheck::validate_class(thr, clazz, true); 912 jniCheck::validate_class(thr, clazz, true);
863 ) 913 )
864 jboolean result = UNCHECKED()->IsInstanceOf(env,obj,clazz); 914 jboolean result = UNCHECKED()->IsInstanceOf(env,obj,clazz);
865 functionExit(env); 915 functionExit(thr);
866 return result; 916 return result;
867 JNI_END 917 JNI_END
868 918
869 JNI_ENTRY_CHECKED(jmethodID, 919 JNI_ENTRY_CHECKED(jmethodID,
870 checked_jni_GetMethodID(JNIEnv *env, 920 checked_jni_GetMethodID(JNIEnv *env,
874 functionEnter(thr); 924 functionEnter(thr);
875 IN_VM( 925 IN_VM(
876 jniCheck::validate_class(thr, clazz, false); 926 jniCheck::validate_class(thr, clazz, false);
877 ) 927 )
878 jmethodID result = UNCHECKED()->GetMethodID(env,clazz,name,sig); 928 jmethodID result = UNCHECKED()->GetMethodID(env,clazz,name,sig);
879 functionExit(env); 929 functionExit(thr);
880 return result; 930 return result;
881 JNI_END 931 JNI_END
882 932
883 #define WRAPPER_CallMethod(ResultType, Result) \ 933 #define WRAPPER_CallMethod(ResultType, Result) \
884 JNI_ENTRY_CHECKED(ResultType, \ 934 JNI_ENTRY_CHECKED(ResultType, \
893 ) \ 943 ) \
894 va_start(args,methodID); \ 944 va_start(args,methodID); \
895 ResultType result =UNCHECKED()->Call##Result##MethodV(env, obj, methodID, \ 945 ResultType result =UNCHECKED()->Call##Result##MethodV(env, obj, methodID, \
896 args); \ 946 args); \
897 va_end(args); \ 947 va_end(args); \
898 functionExit(env); \ 948 thr->set_pending_jni_exception_check("Call"#Result"Method"); \
949 functionExit(thr); \
899 return result; \ 950 return result; \
900 JNI_END \ 951 JNI_END \
901 \ 952 \
902 JNI_ENTRY_CHECKED(ResultType, \ 953 JNI_ENTRY_CHECKED(ResultType, \
903 checked_jni_Call##Result##MethodV(JNIEnv *env, \ 954 checked_jni_Call##Result##MethodV(JNIEnv *env, \
908 IN_VM(\ 959 IN_VM(\
909 jniCheck::validate_call_object(thr, obj, methodID); \ 960 jniCheck::validate_call_object(thr, obj, methodID); \
910 ) \ 961 ) \
911 ResultType result = UNCHECKED()->Call##Result##MethodV(env, obj, methodID,\ 962 ResultType result = UNCHECKED()->Call##Result##MethodV(env, obj, methodID,\
912 args); \ 963 args); \
913 functionExit(env); \ 964 thr->set_pending_jni_exception_check("Call"#Result"MethodV"); \
965 functionExit(thr); \
914 return result; \ 966 return result; \
915 JNI_END \ 967 JNI_END \
916 \ 968 \
917 JNI_ENTRY_CHECKED(ResultType, \ 969 JNI_ENTRY_CHECKED(ResultType, \
918 checked_jni_Call##Result##MethodA(JNIEnv *env, \ 970 checked_jni_Call##Result##MethodA(JNIEnv *env, \
923 IN_VM( \ 975 IN_VM( \
924 jniCheck::validate_call_object(thr, obj, methodID); \ 976 jniCheck::validate_call_object(thr, obj, methodID); \
925 ) \ 977 ) \
926 ResultType result = UNCHECKED()->Call##Result##MethodA(env, obj, methodID,\ 978 ResultType result = UNCHECKED()->Call##Result##MethodA(env, obj, methodID,\
927 args); \ 979 args); \
928 functionExit(env); \ 980 thr->set_pending_jni_exception_check("Call"#Result"MethodA"); \
981 functionExit(thr); \
929 return result; \ 982 return result; \
930 JNI_END 983 JNI_END
931 984
932 WRAPPER_CallMethod(jobject,Object) 985 WRAPPER_CallMethod(jobject,Object)
933 WRAPPER_CallMethod(jboolean,Boolean) 986 WRAPPER_CallMethod(jboolean,Boolean)
950 jniCheck::validate_call_object(thr, obj, methodID); 1003 jniCheck::validate_call_object(thr, obj, methodID);
951 ) 1004 )
952 va_start(args,methodID); 1005 va_start(args,methodID);
953 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args); 1006 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args);
954 va_end(args); 1007 va_end(args);
955 functionExit(env); 1008 thr->set_pending_jni_exception_check("CallVoidMethod");
1009 functionExit(thr);
956 JNI_END 1010 JNI_END
957 1011
958 JNI_ENTRY_CHECKED(void, 1012 JNI_ENTRY_CHECKED(void,
959 checked_jni_CallVoidMethodV(JNIEnv *env, 1013 checked_jni_CallVoidMethodV(JNIEnv *env,
960 jobject obj, 1014 jobject obj,
963 functionEnter(thr); 1017 functionEnter(thr);
964 IN_VM( 1018 IN_VM(
965 jniCheck::validate_call_object(thr, obj, methodID); 1019 jniCheck::validate_call_object(thr, obj, methodID);
966 ) 1020 )
967 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args); 1021 UNCHECKED()->CallVoidMethodV(env,obj,methodID,args);
968 functionExit(env); 1022 thr->set_pending_jni_exception_check("CallVoidMethodV");
1023 functionExit(thr);
969 JNI_END 1024 JNI_END
970 1025
971 JNI_ENTRY_CHECKED(void, 1026 JNI_ENTRY_CHECKED(void,
972 checked_jni_CallVoidMethodA(JNIEnv *env, 1027 checked_jni_CallVoidMethodA(JNIEnv *env,
973 jobject obj, 1028 jobject obj,
976 functionEnter(thr); 1031 functionEnter(thr);
977 IN_VM( 1032 IN_VM(
978 jniCheck::validate_call_object(thr, obj, methodID); 1033 jniCheck::validate_call_object(thr, obj, methodID);
979 ) 1034 )
980 UNCHECKED()->CallVoidMethodA(env,obj,methodID,args); 1035 UNCHECKED()->CallVoidMethodA(env,obj,methodID,args);
981 functionExit(env); 1036 thr->set_pending_jni_exception_check("CallVoidMethodA");
1037 functionExit(thr);
982 JNI_END 1038 JNI_END
983 1039
984 #define WRAPPER_CallNonvirtualMethod(ResultType, Result) \ 1040 #define WRAPPER_CallNonvirtualMethod(ResultType, Result) \
985 JNI_ENTRY_CHECKED(ResultType, \ 1041 JNI_ENTRY_CHECKED(ResultType, \
986 checked_jni_CallNonvirtual##Result##Method(JNIEnv *env, \ 1042 checked_jni_CallNonvirtual##Result##Method(JNIEnv *env, \
999 obj, \ 1055 obj, \
1000 clazz, \ 1056 clazz, \
1001 methodID,\ 1057 methodID,\
1002 args); \ 1058 args); \
1003 va_end(args); \ 1059 va_end(args); \
1004 functionExit(env); \ 1060 thr->set_pending_jni_exception_check("CallNonvirtual"#Result"Method"); \
1061 functionExit(thr); \
1005 return result; \ 1062 return result; \
1006 JNI_END \ 1063 JNI_END \
1007 \ 1064 \
1008 JNI_ENTRY_CHECKED(ResultType, \ 1065 JNI_ENTRY_CHECKED(ResultType, \
1009 checked_jni_CallNonvirtual##Result##MethodV(JNIEnv *env, \ 1066 checked_jni_CallNonvirtual##Result##MethodV(JNIEnv *env, \
1019 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodV(env, \ 1076 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodV(env, \
1020 obj, \ 1077 obj, \
1021 clazz, \ 1078 clazz, \
1022 methodID,\ 1079 methodID,\
1023 args); \ 1080 args); \
1024 functionExit(env); \ 1081 thr->set_pending_jni_exception_check("CallNonvirtual"#Result"MethodV"); \
1082 functionExit(thr); \
1025 return result; \ 1083 return result; \
1026 JNI_END \ 1084 JNI_END \
1027 \ 1085 \
1028 JNI_ENTRY_CHECKED(ResultType, \ 1086 JNI_ENTRY_CHECKED(ResultType, \
1029 checked_jni_CallNonvirtual##Result##MethodA(JNIEnv *env, \ 1087 checked_jni_CallNonvirtual##Result##MethodA(JNIEnv *env, \
1039 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodA(env, \ 1097 ResultType result = UNCHECKED()->CallNonvirtual##Result##MethodA(env, \
1040 obj, \ 1098 obj, \
1041 clazz, \ 1099 clazz, \
1042 methodID,\ 1100 methodID,\
1043 args); \ 1101 args); \
1044 functionExit(env); \ 1102 thr->set_pending_jni_exception_check("CallNonvirtual"#Result"MethodA"); \
1103 functionExit(thr); \
1045 return result; \ 1104 return result; \
1046 JNI_END 1105 JNI_END
1047 1106
1048 WRAPPER_CallNonvirtualMethod(jobject,Object) 1107 WRAPPER_CallNonvirtualMethod(jobject,Object)
1049 WRAPPER_CallNonvirtualMethod(jboolean,Boolean) 1108 WRAPPER_CallNonvirtualMethod(jboolean,Boolean)
1068 jniCheck::validate_call_class(thr, clazz, methodID); 1127 jniCheck::validate_call_class(thr, clazz, methodID);
1069 ) 1128 )
1070 va_start(args,methodID); 1129 va_start(args,methodID);
1071 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args); 1130 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args);
1072 va_end(args); 1131 va_end(args);
1073 functionExit(env); 1132 thr->set_pending_jni_exception_check("CallNonvirtualVoidMethod");
1133 functionExit(thr);
1074 JNI_END 1134 JNI_END
1075 1135
1076 JNI_ENTRY_CHECKED(void, 1136 JNI_ENTRY_CHECKED(void,
1077 checked_jni_CallNonvirtualVoidMethodV(JNIEnv *env, 1137 checked_jni_CallNonvirtualVoidMethodV(JNIEnv *env,
1078 jobject obj, 1138 jobject obj,
1083 IN_VM( 1143 IN_VM(
1084 jniCheck::validate_call_object(thr, obj, methodID); 1144 jniCheck::validate_call_object(thr, obj, methodID);
1085 jniCheck::validate_call_class(thr, clazz, methodID); 1145 jniCheck::validate_call_class(thr, clazz, methodID);
1086 ) 1146 )
1087 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args); 1147 UNCHECKED()->CallNonvirtualVoidMethodV(env,obj,clazz,methodID,args);
1088 functionExit(env); 1148 thr->set_pending_jni_exception_check("CallNonvirtualVoidMethodV");
1149 functionExit(thr);
1089 JNI_END 1150 JNI_END
1090 1151
1091 JNI_ENTRY_CHECKED(void, 1152 JNI_ENTRY_CHECKED(void,
1092 checked_jni_CallNonvirtualVoidMethodA(JNIEnv *env, 1153 checked_jni_CallNonvirtualVoidMethodA(JNIEnv *env,
1093 jobject obj, 1154 jobject obj,
1098 IN_VM( 1159 IN_VM(
1099 jniCheck::validate_call_object(thr, obj, methodID); 1160 jniCheck::validate_call_object(thr, obj, methodID);
1100 jniCheck::validate_call_class(thr, clazz, methodID); 1161 jniCheck::validate_call_class(thr, clazz, methodID);
1101 ) 1162 )
1102 UNCHECKED()->CallNonvirtualVoidMethodA(env,obj,clazz,methodID,args); 1163 UNCHECKED()->CallNonvirtualVoidMethodA(env,obj,clazz,methodID,args);
1103 functionExit(env); 1164 thr->set_pending_jni_exception_check("CallNonvirtualVoidMethodA");
1165 functionExit(thr);
1104 JNI_END 1166 JNI_END
1105 1167
1106 JNI_ENTRY_CHECKED(jfieldID, 1168 JNI_ENTRY_CHECKED(jfieldID,
1107 checked_jni_GetFieldID(JNIEnv *env, 1169 checked_jni_GetFieldID(JNIEnv *env,
1108 jclass clazz, 1170 jclass clazz,
1111 functionEnter(thr); 1173 functionEnter(thr);
1112 IN_VM( 1174 IN_VM(
1113 jniCheck::validate_class(thr, clazz, false); 1175 jniCheck::validate_class(thr, clazz, false);
1114 ) 1176 )
1115 jfieldID result = UNCHECKED()->GetFieldID(env,clazz,name,sig); 1177 jfieldID result = UNCHECKED()->GetFieldID(env,clazz,name,sig);
1116 functionExit(env); 1178 functionExit(thr);
1117 return result; 1179 return result;
1118 JNI_END 1180 JNI_END
1119 1181
1120 #define WRAPPER_GetField(ReturnType,Result,FieldType) \ 1182 #define WRAPPER_GetField(ReturnType,Result,FieldType) \
1121 JNI_ENTRY_CHECKED(ReturnType, \ 1183 JNI_ENTRY_CHECKED(ReturnType, \
1125 functionEnter(thr); \ 1187 functionEnter(thr); \
1126 IN_VM( \ 1188 IN_VM( \
1127 checkInstanceFieldID(thr, fieldID, obj, FieldType); \ 1189 checkInstanceFieldID(thr, fieldID, obj, FieldType); \
1128 ) \ 1190 ) \
1129 ReturnType result = UNCHECKED()->Get##Result##Field(env,obj,fieldID); \ 1191 ReturnType result = UNCHECKED()->Get##Result##Field(env,obj,fieldID); \
1130 functionExit(env); \ 1192 functionExit(thr); \
1131 return result; \ 1193 return result; \
1132 JNI_END 1194 JNI_END
1133 1195
1134 WRAPPER_GetField(jobject, Object, T_OBJECT) 1196 WRAPPER_GetField(jobject, Object, T_OBJECT)
1135 WRAPPER_GetField(jboolean, Boolean, T_BOOLEAN) 1197 WRAPPER_GetField(jboolean, Boolean, T_BOOLEAN)
1150 functionEnter(thr); \ 1212 functionEnter(thr); \
1151 IN_VM( \ 1213 IN_VM( \
1152 checkInstanceFieldID(thr, fieldID, obj, FieldType); \ 1214 checkInstanceFieldID(thr, fieldID, obj, FieldType); \
1153 ) \ 1215 ) \
1154 UNCHECKED()->Set##Result##Field(env,obj,fieldID,val); \ 1216 UNCHECKED()->Set##Result##Field(env,obj,fieldID,val); \
1155 functionExit(env); \ 1217 functionExit(thr); \
1156 JNI_END 1218 JNI_END
1157 1219
1158 WRAPPER_SetField(jobject, Object, T_OBJECT) 1220 WRAPPER_SetField(jobject, Object, T_OBJECT)
1159 WRAPPER_SetField(jboolean, Boolean, T_BOOLEAN) 1221 WRAPPER_SetField(jboolean, Boolean, T_BOOLEAN)
1160 WRAPPER_SetField(jbyte, Byte, T_BYTE) 1222 WRAPPER_SetField(jbyte, Byte, T_BYTE)
1174 functionEnter(thr); 1236 functionEnter(thr);
1175 IN_VM( 1237 IN_VM(
1176 jniCheck::validate_class(thr, clazz, false); 1238 jniCheck::validate_class(thr, clazz, false);
1177 ) 1239 )
1178 jmethodID result = UNCHECKED()->GetStaticMethodID(env,clazz,name,sig); 1240 jmethodID result = UNCHECKED()->GetStaticMethodID(env,clazz,name,sig);
1179 functionExit(env); 1241 functionExit(thr);
1180 return result; 1242 return result;
1181 JNI_END 1243 JNI_END
1182 1244
1183 #define WRAPPER_CallStaticMethod(ReturnType,Result) \ 1245 #define WRAPPER_CallStaticMethod(ReturnType,Result) \
1184 JNI_ENTRY_CHECKED(ReturnType, \ 1246 JNI_ENTRY_CHECKED(ReturnType, \
1196 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \ 1258 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \
1197 clazz, \ 1259 clazz, \
1198 methodID, \ 1260 methodID, \
1199 args); \ 1261 args); \
1200 va_end(args); \ 1262 va_end(args); \
1201 functionExit(env); \ 1263 thr->set_pending_jni_exception_check("CallStatic"#Result"Method"); \
1264 functionExit(thr); \
1202 return result; \ 1265 return result; \
1203 JNI_END \ 1266 JNI_END \
1204 \ 1267 \
1205 JNI_ENTRY_CHECKED(ReturnType, \ 1268 JNI_ENTRY_CHECKED(ReturnType, \
1206 checked_jni_CallStatic##Result##MethodV(JNIEnv *env, \ 1269 checked_jni_CallStatic##Result##MethodV(JNIEnv *env, \
1214 ) \ 1277 ) \
1215 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \ 1278 ReturnType result = UNCHECKED()->CallStatic##Result##MethodV(env, \
1216 clazz, \ 1279 clazz, \
1217 methodID, \ 1280 methodID, \
1218 args); \ 1281 args); \
1219 functionExit(env); \ 1282 thr->set_pending_jni_exception_check("CallStatic"#Result"MethodV"); \
1283 functionExit(thr); \
1220 return result; \ 1284 return result; \
1221 JNI_END \ 1285 JNI_END \
1222 \ 1286 \
1223 JNI_ENTRY_CHECKED(ReturnType, \ 1287 JNI_ENTRY_CHECKED(ReturnType, \
1224 checked_jni_CallStatic##Result##MethodA(JNIEnv *env, \ 1288 checked_jni_CallStatic##Result##MethodA(JNIEnv *env, \
1232 ) \ 1296 ) \
1233 ReturnType result = UNCHECKED()->CallStatic##Result##MethodA(env, \ 1297 ReturnType result = UNCHECKED()->CallStatic##Result##MethodA(env, \
1234 clazz, \ 1298 clazz, \
1235 methodID, \ 1299 methodID, \
1236 args); \ 1300 args); \
1237 functionExit(env); \ 1301 thr->set_pending_jni_exception_check("CallStatic"#Result"MethodA"); \
1302 functionExit(thr); \
1238 return result; \ 1303 return result; \
1239 JNI_END 1304 JNI_END
1240 1305
1241 WRAPPER_CallStaticMethod(jobject,Object) 1306 WRAPPER_CallStaticMethod(jobject,Object)
1242 WRAPPER_CallStaticMethod(jboolean,Boolean) 1307 WRAPPER_CallStaticMethod(jboolean,Boolean)
1260 jniCheck::validate_class(thr, cls, false); 1325 jniCheck::validate_class(thr, cls, false);
1261 ) 1326 )
1262 va_start(args,methodID); 1327 va_start(args,methodID);
1263 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args); 1328 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args);
1264 va_end(args); 1329 va_end(args);
1265 functionExit(env); 1330 thr->set_pending_jni_exception_check("CallStaticVoidMethod");
1331 functionExit(thr);
1266 JNI_END 1332 JNI_END
1267 1333
1268 JNI_ENTRY_CHECKED(void, 1334 JNI_ENTRY_CHECKED(void,
1269 checked_jni_CallStaticVoidMethodV(JNIEnv *env, 1335 checked_jni_CallStaticVoidMethodV(JNIEnv *env,
1270 jclass cls, 1336 jclass cls,
1274 IN_VM( 1340 IN_VM(
1275 jniCheck::validate_jmethod_id(thr, methodID); 1341 jniCheck::validate_jmethod_id(thr, methodID);
1276 jniCheck::validate_class(thr, cls, false); 1342 jniCheck::validate_class(thr, cls, false);
1277 ) 1343 )
1278 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args); 1344 UNCHECKED()->CallStaticVoidMethodV(env,cls,methodID,args);
1279 functionExit(env); 1345 thr->set_pending_jni_exception_check("CallStaticVoidMethodV");
1346 functionExit(thr);
1280 JNI_END 1347 JNI_END
1281 1348
1282 JNI_ENTRY_CHECKED(void, 1349 JNI_ENTRY_CHECKED(void,
1283 checked_jni_CallStaticVoidMethodA(JNIEnv *env, 1350 checked_jni_CallStaticVoidMethodA(JNIEnv *env,
1284 jclass cls, 1351 jclass cls,
1288 IN_VM( 1355 IN_VM(
1289 jniCheck::validate_jmethod_id(thr, methodID); 1356 jniCheck::validate_jmethod_id(thr, methodID);
1290 jniCheck::validate_class(thr, cls, false); 1357 jniCheck::validate_class(thr, cls, false);
1291 ) 1358 )
1292 UNCHECKED()->CallStaticVoidMethodA(env,cls,methodID,args); 1359 UNCHECKED()->CallStaticVoidMethodA(env,cls,methodID,args);
1293 functionExit(env); 1360 thr->set_pending_jni_exception_check("CallStaticVoidMethodA");
1361 functionExit(thr);
1294 JNI_END 1362 JNI_END
1295 1363
1296 JNI_ENTRY_CHECKED(jfieldID, 1364 JNI_ENTRY_CHECKED(jfieldID,
1297 checked_jni_GetStaticFieldID(JNIEnv *env, 1365 checked_jni_GetStaticFieldID(JNIEnv *env,
1298 jclass clazz, 1366 jclass clazz,
1301 functionEnter(thr); 1369 functionEnter(thr);
1302 IN_VM( 1370 IN_VM(
1303 jniCheck::validate_class(thr, clazz, false); 1371 jniCheck::validate_class(thr, clazz, false);
1304 ) 1372 )
1305 jfieldID result = UNCHECKED()->GetStaticFieldID(env,clazz,name,sig); 1373 jfieldID result = UNCHECKED()->GetStaticFieldID(env,clazz,name,sig);
1306 functionExit(env); 1374 functionExit(thr);
1307 return result; 1375 return result;
1308 JNI_END 1376 JNI_END
1309 1377
1310 #define WRAPPER_GetStaticField(ReturnType,Result,FieldType) \ 1378 #define WRAPPER_GetStaticField(ReturnType,Result,FieldType) \
1311 JNI_ENTRY_CHECKED(ReturnType, \ 1379 JNI_ENTRY_CHECKED(ReturnType, \
1318 checkStaticFieldID(thr, fieldID, clazz, FieldType); \ 1386 checkStaticFieldID(thr, fieldID, clazz, FieldType); \
1319 ) \ 1387 ) \
1320 ReturnType result = UNCHECKED()->GetStatic##Result##Field(env, \ 1388 ReturnType result = UNCHECKED()->GetStatic##Result##Field(env, \
1321 clazz, \ 1389 clazz, \
1322 fieldID); \ 1390 fieldID); \
1323 functionExit(env); \ 1391 functionExit(thr); \
1324 return result; \ 1392 return result; \
1325 JNI_END 1393 JNI_END
1326 1394
1327 WRAPPER_GetStaticField(jobject, Object, T_OBJECT) 1395 WRAPPER_GetStaticField(jobject, Object, T_OBJECT)
1328 WRAPPER_GetStaticField(jboolean, Boolean, T_BOOLEAN) 1396 WRAPPER_GetStaticField(jboolean, Boolean, T_BOOLEAN)
1344 IN_VM( \ 1412 IN_VM( \
1345 jniCheck::validate_class(thr, clazz, false); \ 1413 jniCheck::validate_class(thr, clazz, false); \
1346 checkStaticFieldID(thr, fieldID, clazz, FieldType); \ 1414 checkStaticFieldID(thr, fieldID, clazz, FieldType); \
1347 ) \ 1415 ) \
1348 UNCHECKED()->SetStatic##Result##Field(env,clazz,fieldID,value); \ 1416 UNCHECKED()->SetStatic##Result##Field(env,clazz,fieldID,value); \
1349 functionExit(env); \ 1417 functionExit(thr); \
1350 JNI_END 1418 JNI_END
1351 1419
1352 WRAPPER_SetStaticField(jobject, Object, T_OBJECT) 1420 WRAPPER_SetStaticField(jobject, Object, T_OBJECT)
1353 WRAPPER_SetStaticField(jboolean, Boolean, T_BOOLEAN) 1421 WRAPPER_SetStaticField(jboolean, Boolean, T_BOOLEAN)
1354 WRAPPER_SetStaticField(jbyte, Byte, T_BYTE) 1422 WRAPPER_SetStaticField(jbyte, Byte, T_BYTE)
1364 checked_jni_NewString(JNIEnv *env, 1432 checked_jni_NewString(JNIEnv *env,
1365 const jchar *unicode, 1433 const jchar *unicode,
1366 jsize len)) 1434 jsize len))
1367 functionEnter(thr); 1435 functionEnter(thr);
1368 jstring result = UNCHECKED()->NewString(env,unicode,len); 1436 jstring result = UNCHECKED()->NewString(env,unicode,len);
1369 functionExit(env); 1437 functionExit(thr);
1370 return result; 1438 return result;
1371 JNI_END 1439 JNI_END
1372 1440
1373 JNI_ENTRY_CHECKED(jsize, 1441 JNI_ENTRY_CHECKED(jsize,
1374 checked_jni_GetStringLength(JNIEnv *env, 1442 checked_jni_GetStringLength(JNIEnv *env,
1376 functionEnter(thr); 1444 functionEnter(thr);
1377 IN_VM( 1445 IN_VM(
1378 checkString(thr, str); 1446 checkString(thr, str);
1379 ) 1447 )
1380 jsize result = UNCHECKED()->GetStringLength(env,str); 1448 jsize result = UNCHECKED()->GetStringLength(env,str);
1381 functionExit(env); 1449 functionExit(thr);
1382 return result; 1450 return result;
1383 JNI_END 1451 JNI_END
1384 1452
1385 // Arbitrary (but well-known) tag 1453 // Arbitrary (but well-known) tag
1386 const void* STRING_TAG = (void*)0x47114711; 1454 const void* STRING_TAG = (void*)0x47114711;
1405 } 1473 }
1406 // Avoiding call to UNCHECKED()->ReleaseStringChars() since that will fire unexpected dtrace probes 1474 // 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. 1475 // Note that the dtrace arguments for the allocated memory will not match up with this solution.
1408 FreeHeap((char*)result); 1476 FreeHeap((char*)result);
1409 } 1477 }
1410 functionExit(env); 1478 functionExit(thr);
1411 return new_result; 1479 return new_result;
1412 JNI_END 1480 JNI_END
1413 1481
1414 JNI_ENTRY_CHECKED(void, 1482 JNI_ENTRY_CHECKED(void,
1415 checked_jni_ReleaseStringChars(JNIEnv *env, 1483 checked_jni_ReleaseStringChars(JNIEnv *env,
1440 "not allocated by GetStringChars"); 1508 "not allocated by GetStringChars");
1441 } 1509 }
1442 UNCHECKED()->ReleaseStringChars(env, str, 1510 UNCHECKED()->ReleaseStringChars(env, str,
1443 (const jchar*) guarded.release_for_freeing()); 1511 (const jchar*) guarded.release_for_freeing());
1444 } 1512 }
1445 functionExit(env); 1513 functionExit(thr);
1446 JNI_END 1514 JNI_END
1447 1515
1448 JNI_ENTRY_CHECKED(jstring, 1516 JNI_ENTRY_CHECKED(jstring,
1449 checked_jni_NewStringUTF(JNIEnv *env, 1517 checked_jni_NewStringUTF(JNIEnv *env,
1450 const char *utf)) 1518 const char *utf))
1451 functionEnter(thr); 1519 functionEnter(thr);
1452 jstring result = UNCHECKED()->NewStringUTF(env,utf); 1520 jstring result = UNCHECKED()->NewStringUTF(env,utf);
1453 functionExit(env); 1521 functionExit(thr);
1454 return result; 1522 return result;
1455 JNI_END 1523 JNI_END
1456 1524
1457 JNI_ENTRY_CHECKED(jsize, 1525 JNI_ENTRY_CHECKED(jsize,
1458 checked_jni_GetStringUTFLength(JNIEnv *env, 1526 checked_jni_GetStringUTFLength(JNIEnv *env,
1460 functionEnter(thr); 1528 functionEnter(thr);
1461 IN_VM( 1529 IN_VM(
1462 checkString(thr, str); 1530 checkString(thr, str);
1463 ) 1531 )
1464 jsize result = UNCHECKED()->GetStringUTFLength(env,str); 1532 jsize result = UNCHECKED()->GetStringUTFLength(env,str);
1465 functionExit(env); 1533 functionExit(thr);
1466 return result; 1534 return result;
1467 JNI_END 1535 JNI_END
1468 1536
1469 // Arbitrary (but well-known) tag - different than GetStringChars 1537 // Arbitrary (but well-known) tag - different than GetStringChars
1470 const void* STRING_UTF_TAG = (void*) 0x48124812; 1538 const void* STRING_UTF_TAG = (void*) 0x48124812;
1488 } 1556 }
1489 // Avoiding call to UNCHECKED()->ReleaseStringUTFChars() since that will fire unexpected dtrace probes 1557 // 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. 1558 // Note that the dtrace arguments for the allocated memory will not match up with this solution.
1491 FreeHeap((char*)result, mtInternal); 1559 FreeHeap((char*)result, mtInternal);
1492 } 1560 }
1493 functionExit(env); 1561 functionExit(thr);
1494 return new_result; 1562 return new_result;
1495 JNI_END 1563 JNI_END
1496 1564
1497 JNI_ENTRY_CHECKED(void, 1565 JNI_ENTRY_CHECKED(void,
1498 checked_jni_ReleaseStringUTFChars(JNIEnv *env, 1566 checked_jni_ReleaseStringUTFChars(JNIEnv *env,
1523 "called on something not allocated by GetStringUTFChars"); 1591 "called on something not allocated by GetStringUTFChars");
1524 } 1592 }
1525 UNCHECKED()->ReleaseStringUTFChars(env, str, 1593 UNCHECKED()->ReleaseStringUTFChars(env, str,
1526 (const char*) guarded.release_for_freeing()); 1594 (const char*) guarded.release_for_freeing());
1527 } 1595 }
1528 functionExit(env); 1596 functionExit(thr);
1529 JNI_END 1597 JNI_END
1530 1598
1531 JNI_ENTRY_CHECKED(jsize, 1599 JNI_ENTRY_CHECKED(jsize,
1532 checked_jni_GetArrayLength(JNIEnv *env, 1600 checked_jni_GetArrayLength(JNIEnv *env,
1533 jarray array)) 1601 jarray array))
1534 functionEnter(thr); 1602 functionEnter(thr);
1535 IN_VM( 1603 IN_VM(
1536 check_is_array(thr, array); 1604 check_is_array(thr, array);
1537 ) 1605 )
1538 jsize result = UNCHECKED()->GetArrayLength(env,array); 1606 jsize result = UNCHECKED()->GetArrayLength(env,array);
1539 functionExit(env); 1607 functionExit(thr);
1540 return result; 1608 return result;
1541 JNI_END 1609 JNI_END
1542 1610
1543 JNI_ENTRY_CHECKED(jobjectArray, 1611 JNI_ENTRY_CHECKED(jobjectArray,
1544 checked_jni_NewObjectArray(JNIEnv *env, 1612 checked_jni_NewObjectArray(JNIEnv *env,
1545 jsize len, 1613 jsize len,
1546 jclass clazz, 1614 jclass clazz,
1547 jobject init)) 1615 jobject init))
1548 functionEnter(thr); 1616 functionEnter(thr);
1549 jobjectArray result = UNCHECKED()->NewObjectArray(env,len,clazz,init); 1617 jobjectArray result = UNCHECKED()->NewObjectArray(env,len,clazz,init);
1550 functionExit(env); 1618 functionExit(thr);
1551 return result; 1619 return result;
1552 JNI_END 1620 JNI_END
1553 1621
1554 JNI_ENTRY_CHECKED(jobject, 1622 JNI_ENTRY_CHECKED(jobject,
1555 checked_jni_GetObjectArrayElement(JNIEnv *env, 1623 checked_jni_GetObjectArrayElement(JNIEnv *env,
1558 functionEnter(thr); 1626 functionEnter(thr);
1559 IN_VM( 1627 IN_VM(
1560 check_is_obj_array(thr, array); 1628 check_is_obj_array(thr, array);
1561 ) 1629 )
1562 jobject result = UNCHECKED()->GetObjectArrayElement(env,array,index); 1630 jobject result = UNCHECKED()->GetObjectArrayElement(env,array,index);
1563 functionExit(env); 1631 thr->set_pending_jni_exception_check("GetObjectArrayElement");
1632 functionExit(thr);
1564 return result; 1633 return result;
1565 JNI_END 1634 JNI_END
1566 1635
1567 JNI_ENTRY_CHECKED(void, 1636 JNI_ENTRY_CHECKED(void,
1568 checked_jni_SetObjectArrayElement(JNIEnv *env, 1637 checked_jni_SetObjectArrayElement(JNIEnv *env,
1572 functionEnter(thr); 1641 functionEnter(thr);
1573 IN_VM( 1642 IN_VM(
1574 check_is_obj_array(thr, array); 1643 check_is_obj_array(thr, array);
1575 ) 1644 )
1576 UNCHECKED()->SetObjectArrayElement(env,array,index,val); 1645 UNCHECKED()->SetObjectArrayElement(env,array,index,val);
1577 functionExit(env); 1646 thr->set_pending_jni_exception_check("SetObjectArrayElement");
1647 functionExit(thr);
1578 JNI_END 1648 JNI_END
1579 1649
1580 #define WRAPPER_NewScalarArray(Return, Result) \ 1650 #define WRAPPER_NewScalarArray(Return, Result) \
1581 JNI_ENTRY_CHECKED(Return, \ 1651 JNI_ENTRY_CHECKED(Return, \
1582 checked_jni_New##Result##Array(JNIEnv *env, \ 1652 checked_jni_New##Result##Array(JNIEnv *env, \
1583 jsize len)) \ 1653 jsize len)) \
1584 functionEnter(thr); \ 1654 functionEnter(thr); \
1585 Return result = UNCHECKED()->New##Result##Array(env,len); \ 1655 Return result = UNCHECKED()->New##Result##Array(env,len); \
1586 functionExit(env); \ 1656 functionExit(thr); \
1587 return (Return) result; \ 1657 return (Return) result; \
1588 JNI_END 1658 JNI_END
1589 1659
1590 WRAPPER_NewScalarArray(jbooleanArray, Boolean) 1660 WRAPPER_NewScalarArray(jbooleanArray, Boolean)
1591 WRAPPER_NewScalarArray(jbyteArray, Byte) 1661 WRAPPER_NewScalarArray(jbyteArray, Byte)
1609 array, \ 1679 array, \
1610 isCopy); \ 1680 isCopy); \
1611 if (result != NULL) { \ 1681 if (result != NULL) { \
1612 result = (ElementType *) check_jni_wrap_copy_array(thr, array, result); \ 1682 result = (ElementType *) check_jni_wrap_copy_array(thr, array, result); \
1613 } \ 1683 } \
1614 functionExit(env); \ 1684 functionExit(thr); \
1615 return result; \ 1685 return result; \
1616 JNI_END 1686 JNI_END
1617 1687
1618 WRAPPER_GetScalarArrayElements(T_BOOLEAN, jboolean, Boolean) 1688 WRAPPER_GetScalarArrayElements(T_BOOLEAN, jboolean, Boolean)
1619 WRAPPER_GetScalarArrayElements(T_BYTE, jbyte, Byte) 1689 WRAPPER_GetScalarArrayElements(T_BYTE, jbyte, Byte)
1637 typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \ 1707 typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
1638 ) \ 1708 ) \
1639 ElementType* orig_result = (ElementType *) check_wrapped_array_release( \ 1709 ElementType* orig_result = (ElementType *) check_wrapped_array_release( \
1640 thr, "checked_jni_Release"#Result"ArrayElements", array, elems, mode); \ 1710 thr, "checked_jni_Release"#Result"ArrayElements", array, elems, mode); \
1641 UNCHECKED()->Release##Result##ArrayElements(env, array, orig_result, mode); \ 1711 UNCHECKED()->Release##Result##ArrayElements(env, array, orig_result, mode); \
1642 functionExit(env); \ 1712 functionExit(thr); \
1643 JNI_END 1713 JNI_END
1644 1714
1645 WRAPPER_ReleaseScalarArrayElements(T_BOOLEAN,jboolean, Boolean, bool) 1715 WRAPPER_ReleaseScalarArrayElements(T_BOOLEAN,jboolean, Boolean, bool)
1646 WRAPPER_ReleaseScalarArrayElements(T_BYTE, jbyte, Byte, byte) 1716 WRAPPER_ReleaseScalarArrayElements(T_BYTE, jbyte, Byte, byte)
1647 WRAPPER_ReleaseScalarArrayElements(T_SHORT, jshort, Short, short) 1717 WRAPPER_ReleaseScalarArrayElements(T_SHORT, jshort, Short, short)
1661 functionEnter(thr); \ 1731 functionEnter(thr); \
1662 IN_VM( \ 1732 IN_VM( \
1663 check_primitive_array_type(thr, array, ElementTag); \ 1733 check_primitive_array_type(thr, array, ElementTag); \
1664 ) \ 1734 ) \
1665 UNCHECKED()->Get##Result##ArrayRegion(env,array,start,len,buf); \ 1735 UNCHECKED()->Get##Result##ArrayRegion(env,array,start,len,buf); \
1666 functionExit(env); \ 1736 thr->set_pending_jni_exception_check("Get"#Result"ArrayRegion"); \
1737 functionExit(thr); \
1667 JNI_END 1738 JNI_END
1668 1739
1669 WRAPPER_GetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean) 1740 WRAPPER_GetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean)
1670 WRAPPER_GetScalarArrayRegion(T_BYTE, jbyte, Byte) 1741 WRAPPER_GetScalarArrayRegion(T_BYTE, jbyte, Byte)
1671 WRAPPER_GetScalarArrayRegion(T_SHORT, jshort, Short) 1742 WRAPPER_GetScalarArrayRegion(T_SHORT, jshort, Short)
1685 functionEnter(thr); \ 1756 functionEnter(thr); \
1686 IN_VM( \ 1757 IN_VM( \
1687 check_primitive_array_type(thr, array, ElementTag); \ 1758 check_primitive_array_type(thr, array, ElementTag); \
1688 ) \ 1759 ) \
1689 UNCHECKED()->Set##Result##ArrayRegion(env,array,start,len,buf); \ 1760 UNCHECKED()->Set##Result##ArrayRegion(env,array,start,len,buf); \
1690 functionExit(env); \ 1761 thr->set_pending_jni_exception_check("Set"#Result"ArrayRegion"); \
1762 functionExit(thr); \
1691 JNI_END 1763 JNI_END
1692 1764
1693 WRAPPER_SetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean) 1765 WRAPPER_SetScalarArrayRegion(T_BOOLEAN, jboolean, Boolean)
1694 WRAPPER_SetScalarArrayRegion(T_BYTE, jbyte, Byte) 1766 WRAPPER_SetScalarArrayRegion(T_BYTE, jbyte, Byte)
1695 WRAPPER_SetScalarArrayRegion(T_SHORT, jshort, Short) 1767 WRAPPER_SetScalarArrayRegion(T_SHORT, jshort, Short)
1704 jclass clazz, 1776 jclass clazz,
1705 const JNINativeMethod *methods, 1777 const JNINativeMethod *methods,
1706 jint nMethods)) 1778 jint nMethods))
1707 functionEnter(thr); 1779 functionEnter(thr);
1708 jint result = UNCHECKED()->RegisterNatives(env,clazz,methods,nMethods); 1780 jint result = UNCHECKED()->RegisterNatives(env,clazz,methods,nMethods);
1709 functionExit(env); 1781 functionExit(thr);
1710 return result; 1782 return result;
1711 JNI_END 1783 JNI_END
1712 1784
1713 JNI_ENTRY_CHECKED(jint, 1785 JNI_ENTRY_CHECKED(jint,
1714 checked_jni_UnregisterNatives(JNIEnv *env, 1786 checked_jni_UnregisterNatives(JNIEnv *env,
1715 jclass clazz)) 1787 jclass clazz))
1716 functionEnter(thr); 1788 functionEnter(thr);
1717 jint result = UNCHECKED()->UnregisterNatives(env,clazz); 1789 jint result = UNCHECKED()->UnregisterNatives(env,clazz);
1718 functionExit(env); 1790 functionExit(thr);
1719 return result; 1791 return result;
1720 JNI_END 1792 JNI_END
1721 1793
1722 JNI_ENTRY_CHECKED(jint, 1794 JNI_ENTRY_CHECKED(jint,
1723 checked_jni_MonitorEnter(JNIEnv *env, 1795 checked_jni_MonitorEnter(JNIEnv *env,
1725 functionEnter(thr); 1797 functionEnter(thr);
1726 IN_VM( 1798 IN_VM(
1727 jniCheck::validate_object(thr, obj); 1799 jniCheck::validate_object(thr, obj);
1728 ) 1800 )
1729 jint result = UNCHECKED()->MonitorEnter(env,obj); 1801 jint result = UNCHECKED()->MonitorEnter(env,obj);
1730 functionExit(env); 1802 functionExit(thr);
1731 return result; 1803 return result;
1732 JNI_END 1804 JNI_END
1733 1805
1734 JNI_ENTRY_CHECKED(jint, 1806 JNI_ENTRY_CHECKED(jint,
1735 checked_jni_MonitorExit(JNIEnv *env, 1807 checked_jni_MonitorExit(JNIEnv *env,
1737 functionEnterExceptionAllowed(thr); 1809 functionEnterExceptionAllowed(thr);
1738 IN_VM( 1810 IN_VM(
1739 jniCheck::validate_object(thr, obj); 1811 jniCheck::validate_object(thr, obj);
1740 ) 1812 )
1741 jint result = UNCHECKED()->MonitorExit(env,obj); 1813 jint result = UNCHECKED()->MonitorExit(env,obj);
1742 functionExit(env); 1814 functionExit(thr);
1743 return result; 1815 return result;
1744 JNI_END 1816 JNI_END
1745 1817
1746 JNI_ENTRY_CHECKED(jint, 1818 JNI_ENTRY_CHECKED(jint,
1747 checked_jni_GetJavaVM(JNIEnv *env, 1819 checked_jni_GetJavaVM(JNIEnv *env,
1748 JavaVM **vm)) 1820 JavaVM **vm))
1749 functionEnter(thr); 1821 functionEnter(thr);
1750 jint result = UNCHECKED()->GetJavaVM(env,vm); 1822 jint result = UNCHECKED()->GetJavaVM(env,vm);
1751 functionExit(env); 1823 functionExit(thr);
1752 return result; 1824 return result;
1753 JNI_END 1825 JNI_END
1754 1826
1755 JNI_ENTRY_CHECKED(void, 1827 JNI_ENTRY_CHECKED(void,
1756 checked_jni_GetStringRegion(JNIEnv *env, 1828 checked_jni_GetStringRegion(JNIEnv *env,
1761 functionEnter(thr); 1833 functionEnter(thr);
1762 IN_VM( 1834 IN_VM(
1763 checkString(thr, str); 1835 checkString(thr, str);
1764 ) 1836 )
1765 UNCHECKED()->GetStringRegion(env, str, start, len, buf); 1837 UNCHECKED()->GetStringRegion(env, str, start, len, buf);
1766 functionExit(env); 1838 thr->set_pending_jni_exception_check("GetStringRegion");
1839 functionExit(thr);
1767 JNI_END 1840 JNI_END
1768 1841
1769 JNI_ENTRY_CHECKED(void, 1842 JNI_ENTRY_CHECKED(void,
1770 checked_jni_GetStringUTFRegion(JNIEnv *env, 1843 checked_jni_GetStringUTFRegion(JNIEnv *env,
1771 jstring str, 1844 jstring str,
1775 functionEnter(thr); 1848 functionEnter(thr);
1776 IN_VM( 1849 IN_VM(
1777 checkString(thr, str); 1850 checkString(thr, str);
1778 ) 1851 )
1779 UNCHECKED()->GetStringUTFRegion(env, str, start, len, buf); 1852 UNCHECKED()->GetStringUTFRegion(env, str, start, len, buf);
1780 functionExit(env); 1853 thr->set_pending_jni_exception_check("GetStringUTFRegion");
1854 functionExit(thr);
1781 JNI_END 1855 JNI_END
1782 1856
1783 JNI_ENTRY_CHECKED(void *, 1857 JNI_ENTRY_CHECKED(void *,
1784 checked_jni_GetPrimitiveArrayCritical(JNIEnv *env, 1858 checked_jni_GetPrimitiveArrayCritical(JNIEnv *env,
1785 jarray array, 1859 jarray array,
1790 ) 1864 )
1791 void *result = UNCHECKED()->GetPrimitiveArrayCritical(env, array, isCopy); 1865 void *result = UNCHECKED()->GetPrimitiveArrayCritical(env, array, isCopy);
1792 if (result != NULL) { 1866 if (result != NULL) {
1793 result = check_jni_wrap_copy_array(thr, array, result); 1867 result = check_jni_wrap_copy_array(thr, array, result);
1794 } 1868 }
1795 functionExit(env); 1869 functionExit(thr);
1796 return result; 1870 return result;
1797 JNI_END 1871 JNI_END
1798 1872
1799 JNI_ENTRY_CHECKED(void, 1873 JNI_ENTRY_CHECKED(void,
1800 checked_jni_ReleasePrimitiveArrayCritical(JNIEnv *env, 1874 checked_jni_ReleasePrimitiveArrayCritical(JNIEnv *env,
1806 check_is_primitive_array(thr, array); 1880 check_is_primitive_array(thr, array);
1807 ) 1881 )
1808 // Check the element array... 1882 // Check the element array...
1809 void* orig_result = check_wrapped_array_release(thr, "ReleasePrimitiveArrayCritical", array, carray, mode); 1883 void* orig_result = check_wrapped_array_release(thr, "ReleasePrimitiveArrayCritical", array, carray, mode);
1810 UNCHECKED()->ReleasePrimitiveArrayCritical(env, array, orig_result, mode); 1884 UNCHECKED()->ReleasePrimitiveArrayCritical(env, array, orig_result, mode);
1811 functionExit(env); 1885 functionExit(thr);
1812 JNI_END 1886 JNI_END
1813 1887
1814 JNI_ENTRY_CHECKED(const jchar*, 1888 JNI_ENTRY_CHECKED(const jchar*,
1815 checked_jni_GetStringCritical(JNIEnv *env, 1889 checked_jni_GetStringCritical(JNIEnv *env,
1816 jstring string, 1890 jstring string,
1818 functionEnterCritical(thr); 1892 functionEnterCritical(thr);
1819 IN_VM( 1893 IN_VM(
1820 checkString(thr, string); 1894 checkString(thr, string);
1821 ) 1895 )
1822 const jchar *result = UNCHECKED()->GetStringCritical(env, string, isCopy); 1896 const jchar *result = UNCHECKED()->GetStringCritical(env, string, isCopy);
1823 functionExit(env); 1897 functionExit(thr);
1824 return result; 1898 return result;
1825 JNI_END 1899 JNI_END
1826 1900
1827 JNI_ENTRY_CHECKED(void, 1901 JNI_ENTRY_CHECKED(void,
1828 checked_jni_ReleaseStringCritical(JNIEnv *env, 1902 checked_jni_ReleaseStringCritical(JNIEnv *env,
1834 ) 1908 )
1835 /* The Hotspot JNI code does not use the parameters, so just check the 1909 /* The Hotspot JNI code does not use the parameters, so just check the
1836 * string parameter as a minor sanity check 1910 * string parameter as a minor sanity check
1837 */ 1911 */
1838 UNCHECKED()->ReleaseStringCritical(env, str, chars); 1912 UNCHECKED()->ReleaseStringCritical(env, str, chars);
1839 functionExit(env); 1913 functionExit(thr);
1840 JNI_END 1914 JNI_END
1841 1915
1842 JNI_ENTRY_CHECKED(jweak, 1916 JNI_ENTRY_CHECKED(jweak,
1843 checked_jni_NewWeakGlobalRef(JNIEnv *env, 1917 checked_jni_NewWeakGlobalRef(JNIEnv *env,
1844 jobject obj)) 1918 jobject obj))
1847 if (obj != NULL) { 1921 if (obj != NULL) {
1848 jniCheck::validate_handle(thr, obj); 1922 jniCheck::validate_handle(thr, obj);
1849 } 1923 }
1850 ) 1924 )
1851 jweak result = UNCHECKED()->NewWeakGlobalRef(env, obj); 1925 jweak result = UNCHECKED()->NewWeakGlobalRef(env, obj);
1852 functionExit(env); 1926 functionExit(thr);
1853 return result; 1927 return result;
1854 JNI_END 1928 JNI_END
1855 1929
1856 JNI_ENTRY_CHECKED(void, 1930 JNI_ENTRY_CHECKED(void,
1857 checked_jni_DeleteWeakGlobalRef(JNIEnv *env, 1931 checked_jni_DeleteWeakGlobalRef(JNIEnv *env,
1858 jweak ref)) 1932 jweak ref))
1859 functionEnterExceptionAllowed(thr); 1933 functionEnterExceptionAllowed(thr);
1860 UNCHECKED()->DeleteWeakGlobalRef(env, ref); 1934 UNCHECKED()->DeleteWeakGlobalRef(env, ref);
1861 functionExit(env); 1935 functionExit(thr);
1862 JNI_END 1936 JNI_END
1863 1937
1864 JNI_ENTRY_CHECKED(jboolean, 1938 JNI_ENTRY_CHECKED(jboolean,
1865 checked_jni_ExceptionCheck(JNIEnv *env)) 1939 checked_jni_ExceptionCheck(JNIEnv *env))
1940 thr->clear_pending_jni_exception_check();
1866 functionEnterExceptionAllowed(thr); 1941 functionEnterExceptionAllowed(thr);
1867 jboolean result = UNCHECKED()->ExceptionCheck(env); 1942 jboolean result = UNCHECKED()->ExceptionCheck(env);
1868 functionExit(env); 1943 functionExit(thr);
1869 return result; 1944 return result;
1870 JNI_END 1945 JNI_END
1871 1946
1872 JNI_ENTRY_CHECKED(jobject, 1947 JNI_ENTRY_CHECKED(jobject,
1873 checked_jni_NewDirectByteBuffer(JNIEnv *env, 1948 checked_jni_NewDirectByteBuffer(JNIEnv *env,
1874 void *address, 1949 void *address,
1875 jlong capacity)) 1950 jlong capacity))
1876 functionEnter(thr); 1951 functionEnter(thr);
1877 jobject result = UNCHECKED()->NewDirectByteBuffer(env, address, capacity); 1952 jobject result = UNCHECKED()->NewDirectByteBuffer(env, address, capacity);
1878 functionExit(env); 1953 functionExit(thr);
1879 return result; 1954 return result;
1880 JNI_END 1955 JNI_END
1881 1956
1882 JNI_ENTRY_CHECKED(void *, 1957 JNI_ENTRY_CHECKED(void *,
1883 checked_jni_GetDirectBufferAddress(JNIEnv *env, 1958 checked_jni_GetDirectBufferAddress(JNIEnv *env,
1884 jobject buf)) 1959 jobject buf))
1885 functionEnter(thr); 1960 functionEnter(thr);
1886 void* result = UNCHECKED()->GetDirectBufferAddress(env, buf); 1961 void* result = UNCHECKED()->GetDirectBufferAddress(env, buf);
1887 functionExit(env); 1962 functionExit(thr);
1888 return result; 1963 return result;
1889 JNI_END 1964 JNI_END
1890 1965
1891 JNI_ENTRY_CHECKED(jlong, 1966 JNI_ENTRY_CHECKED(jlong,
1892 checked_jni_GetDirectBufferCapacity(JNIEnv *env, 1967 checked_jni_GetDirectBufferCapacity(JNIEnv *env,
1893 jobject buf)) 1968 jobject buf))
1894 functionEnter(thr); 1969 functionEnter(thr);
1895 jlong result = UNCHECKED()->GetDirectBufferCapacity(env, buf); 1970 jlong result = UNCHECKED()->GetDirectBufferCapacity(env, buf);
1896 functionExit(env); 1971 functionExit(thr);
1897 return result; 1972 return result;
1898 JNI_END 1973 JNI_END
1899 1974
1900 JNI_ENTRY_CHECKED(jobjectRefType, 1975 JNI_ENTRY_CHECKED(jobjectRefType,
1901 checked_jni_GetObjectRefType(JNIEnv *env, 1976 checked_jni_GetObjectRefType(JNIEnv *env,
1904 /* validate the object being passed */ 1979 /* validate the object being passed */
1905 IN_VM( 1980 IN_VM(
1906 jniCheck::validate_object(thr, obj); 1981 jniCheck::validate_object(thr, obj);
1907 ) 1982 )
1908 jobjectRefType result = UNCHECKED()->GetObjectRefType(env, obj); 1983 jobjectRefType result = UNCHECKED()->GetObjectRefType(env, obj);
1909 functionExit(env); 1984 functionExit(thr);
1910 return result; 1985 return result;
1911 JNI_END 1986 JNI_END
1912 1987
1913 1988
1914 JNI_ENTRY_CHECKED(jint, 1989 JNI_ENTRY_CHECKED(jint,
1915 checked_jni_GetVersion(JNIEnv *env)) 1990 checked_jni_GetVersion(JNIEnv *env))
1916 functionEnter(thr); 1991 functionEnter(thr);
1917 jint result = UNCHECKED()->GetVersion(env); 1992 jint result = UNCHECKED()->GetVersion(env);
1918 functionExit(env); 1993 functionExit(thr);
1919 return result; 1994 return result;
1920 JNI_END 1995 JNI_END
1921 1996
1922 1997
1923 1998