< prev index next >

src/hotspot/share/classfile/systemDictionary.cpp

Print this page

        

*** 51,60 **** --- 51,61 ---- #include "logging/logStream.hpp" #include "memory/filemap.hpp" #include "memory/metaspaceClosure.hpp" #include "memory/oopFactory.hpp" #include "memory/resourceArea.hpp" + #include "oops/access.inline.hpp" #include "oops/instanceKlass.hpp" #include "oops/instanceRefKlass.hpp" #include "oops/klass.inline.hpp" #include "oops/method.inline.hpp" #include "oops/methodData.hpp"
*** 1827,1837 **** class VerifySDReachableAndLiveClosure : public OopClosure { private: BoolObjectClosure* _is_alive; template <class T> void do_oop_work(T* p) { ! oop obj = oopDesc::load_decode_heap_oop(p); guarantee(_is_alive->do_object_b(obj), "Oop in protection domain cache table must be live"); } public: VerifySDReachableAndLiveClosure(BoolObjectClosure* is_alive) : OopClosure(), _is_alive(is_alive) { } --- 1828,1838 ---- class VerifySDReachableAndLiveClosure : public OopClosure { private: BoolObjectClosure* _is_alive; template <class T> void do_oop_work(T* p) { ! oop obj = RawAccess<>::oop_load(p); guarantee(_is_alive->do_object_b(obj), "Oop in protection domain cache table must be live"); } public: VerifySDReachableAndLiveClosure(BoolObjectClosure* is_alive) : OopClosure(), _is_alive(is_alive) { }
*** 2697,2707 **** if (!can_be_cached) { // Resolve, throwing a real error if it doesn't work. mirror = ss.as_java_mirror(class_loader, protection_domain, SignatureStream::NCDFError, CHECK_(empty)); } ! assert(!oopDesc::is_null(mirror), "%s", ss.as_symbol(THREAD)->as_C_string()); if (ss.at_return_type()) rt = Handle(THREAD, mirror); else pts->obj_at_put(arg++, mirror); --- 2698,2708 ---- if (!can_be_cached) { // Resolve, throwing a real error if it doesn't work. mirror = ss.as_java_mirror(class_loader, protection_domain, SignatureStream::NCDFError, CHECK_(empty)); } ! assert(mirror != NULL, "%s", ss.as_symbol(THREAD)->as_C_string()); if (ss.at_return_type()) rt = Handle(THREAD, mirror); else pts->obj_at_put(arg++, mirror);
< prev index next >