Mercurial > hg > truffle

comparison src/share/vm/runtime/sharedRuntime.cpp @ 1142:4ce7240d622c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6914300: ciEnv should export all well known classes Reviewed-by: kvn, twisti
author never
date Wed, 06 Jan 2010 14:22:39 -0800
parents dd57230ba8fe
children cf0685d550f1
comparison
equal deleted inserted replaced
1140:1f6d42899c3a 1142:4ce7240d622c
858 methodHandle callee_method; 858 methodHandle callee_method;
859 callee_method = resolve_sub_helper(thread, is_virtual, is_optimized, THREAD); 859 callee_method = resolve_sub_helper(thread, is_virtual, is_optimized, THREAD);
860 if (JvmtiExport::can_hotswap_or_post_breakpoint()) { 860 if (JvmtiExport::can_hotswap_or_post_breakpoint()) {
861 int retry_count = 0; 861 int retry_count = 0;
862 while (!HAS_PENDING_EXCEPTION && callee_method->is_old() && 862 while (!HAS_PENDING_EXCEPTION && callee_method->is_old() &&
863 callee_method->method_holder() != SystemDictionary::object_klass()) { 863 callee_method->method_holder() != SystemDictionary::Object_klass()) {
864 // If has a pending exception then there is no need to re-try to 864 // If has a pending exception then there is no need to re-try to
865 // resolve this method. 865 // resolve this method.
866 // If the method has been redefined, we need to try again. 866 // If the method has been redefined, we need to try again.
867 // Hack: we have no way to update the vtables of arrays, so don't 867 // Hack: we have no way to update the vtables of arrays, so don't
868 // require that java.lang.Object has been updated. 868 // require that java.lang.Object has been updated.
1536 } 1536 }
1537 1537
1538 oop SharedRuntime::wrong_method_type_is_for_single_argument(JavaThread* thr, 1538 oop SharedRuntime::wrong_method_type_is_for_single_argument(JavaThread* thr,
1539 oopDesc* required) { 1539 oopDesc* required) {
1540 if (required == NULL) return NULL; 1540 if (required == NULL) return NULL;
1541 if (required->klass() == SystemDictionary::class_klass()) 1541 if (required->klass() == SystemDictionary::Class_klass())
1542 return required; 1542 return required;
1543 if (required->is_klass()) 1543 if (required->is_klass())
1544 return Klass::cast(klassOop(required))->java_mirror(); 1544 return Klass::cast(klassOop(required))->java_mirror();
1545 return NULL; 1545 return NULL;
1546 } 1546 }