Mercurial > hg > graal-jvmci-8
comparison src/share/vm/prims/jvmtiRedefineClasses.cpp @ 982:7a102acc9f17
Merge
author | trims |
---|---|
date | Fri, 25 Sep 2009 12:17:06 -0700 |
parents | ad6585fd4087 |
children | 4ce7240d622c |
comparison
equal
deleted
inserted
replaced
948:89e0543e1737 | 982:7a102acc9f17 |
---|---|
931 // the_class to scratch_class in the JVM_* functions called by the | 931 // the_class to scratch_class in the JVM_* functions called by the |
932 // verifier. Please, refer to jvmtiThreadState.hpp for the detailed | 932 // verifier. Please, refer to jvmtiThreadState.hpp for the detailed |
933 // description. | 933 // description. |
934 RedefineVerifyMark rvm(&the_class, &scratch_class, state); | 934 RedefineVerifyMark rvm(&the_class, &scratch_class, state); |
935 Verifier::verify( | 935 Verifier::verify( |
936 scratch_class, Verifier::ThrowException, THREAD); | 936 scratch_class, Verifier::ThrowException, true, THREAD); |
937 } | 937 } |
938 | 938 |
939 if (HAS_PENDING_EXCEPTION) { | 939 if (HAS_PENDING_EXCEPTION) { |
940 symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); | 940 symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); |
941 // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark | 941 // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |
957 | 957 |
958 if (VerifyMergedCPBytecodes) { | 958 if (VerifyMergedCPBytecodes) { |
959 // verify what we have done during constant pool merging | 959 // verify what we have done during constant pool merging |
960 { | 960 { |
961 RedefineVerifyMark rvm(&the_class, &scratch_class, state); | 961 RedefineVerifyMark rvm(&the_class, &scratch_class, state); |
962 Verifier::verify(scratch_class, Verifier::ThrowException, THREAD); | 962 Verifier::verify(scratch_class, Verifier::ThrowException, true, THREAD); |
963 } | 963 } |
964 | 964 |
965 if (HAS_PENDING_EXCEPTION) { | 965 if (HAS_PENDING_EXCEPTION) { |
966 symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); | 966 symbolOop ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); |
967 // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark | 967 // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark |