archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 17:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8229839: Break circular dependency between oop.inline.hpp and markWord.inline.hpp

Browse source 
Reviewed-by: pliden, tonyp
This commit is contained in:
Stefan Karlsson 2019-08-19 12:40:27 +02:00
parent a3d6be2b2d
commit ebf98ac78c
12 changed files with 91 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/hotspot/share/oops/oop.inline.hpp
View file

@ -82,11 +82,11 @@ markWord oopDesc::cas_set_mark_raw(markWord new_mark, markWord old_mark, atomic_
}
void oopDesc::init_mark() {
set_mark(markWord::prototype_for_object(this));
set_mark(markWord::prototype_for_klass(klass()));
}
void oopDesc::init_mark_raw() {
set_mark_raw(markWord::prototype_for_object(this));
set_mark_raw(markWord::prototype_for_klass(klass()));
}
Klass* oopDesc::klass() const {
@ -483,4 +483,34 @@ void oopDesc::set_displaced_mark_raw(markWord m) {
mark_raw().set_displaced_mark_helper(m);
}
// Supports deferred calling of obj->klass().
class DeferredObjectToKlass {
const oopDesc* _obj;
public:
DeferredObjectToKlass(const oopDesc* obj) : _obj(obj) {}
// Implicitly convertible to const Klass*.
operator const Klass*() const {
return _obj->klass();
}
};
bool oopDesc::mark_must_be_preserved() const {
return mark_must_be_preserved(mark_raw());
}
bool oopDesc::mark_must_be_preserved(markWord m) const {
// There's a circular dependency between oop.inline.hpp and
// markWord.inline.hpp because markWord::must_be_preserved wants to call
// oopDesc::klass(). This could be solved by calling klass() here. However,
// not all paths inside must_be_preserved calls klass(). Defer the call until
// the klass is actually needed.
return m.must_be_preserved(DeferredObjectToKlass(this));
}
bool oopDesc::mark_must_be_preserved_for_promotion_failure(markWord m) const {
return m.must_be_preserved_for_promotion_failure(DeferredObjectToKlass(this));
}
#endif // SHARE_OOPS_OOP_INLINE_HPP