--- a/src/hotspot/share/oops/oop.inline.hpp Fri May 04 09:29:14 2018 +0200
+++ b/src/hotspot/share/oops/oop.inline.hpp Fri May 04 11:41:35 2018 +0200
@@ -25,9 +25,7 @@
#ifndef SHARE_VM_OOPS_OOP_INLINE_HPP
#define SHARE_VM_OOPS_OOP_INLINE_HPP
-#include "gc/shared/ageTable.hpp"
#include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/generation.hpp"
#include "oops/access.inline.hpp"
#include "oops/arrayKlass.hpp"
#include "oops/arrayOop.hpp"
@@ -350,7 +348,6 @@
return cas_set_mark_raw(m, compare) == compare;
}
-#if INCLUDE_ALL_GCS
oop oopDesc::forward_to_atomic(oop p) {
markOop oldMark = mark_raw();
markOop forwardPtrMark = markOopDesc::encode_pointer_as_mark(p);
@@ -372,7 +369,6 @@
}
return forwardee();
}
-#endif
// Note that the forwardee is not the same thing as the displaced_mark.
// The forwardee is used when copying during scavenge and mark-sweep.
@@ -400,7 +396,7 @@
}
}
-#if INCLUDE_ALL_GCS
+#if INCLUDE_PARALLELGC
void oopDesc::pc_follow_contents(ParCompactionManager* cm) {
klass()->oop_pc_follow_contents(this, cm);
}
@@ -422,7 +418,7 @@
}
// Else skip it. The TypeArrayKlass in the header never needs scavenging.
}
-#endif // INCLUDE_ALL_GCS
+#endif // INCLUDE_PARALLELGC
#define OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \
\
@@ -462,7 +458,7 @@
return oop_iterate_size(&cl, mr);
}
-#if INCLUDE_ALL_GCS
+#if INCLUDE_OOP_OOP_ITERATE_BACKWARDS
#define OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
\
inline void oopDesc::oop_iterate_backwards(OopClosureType* blk) { \
@@ -470,7 +466,7 @@
}
#else
#define OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix)
-#endif // INCLUDE_ALL_GCS
+#endif
#define ALL_OOPDESC_OOP_ITERATE(OopClosureType, nv_suffix) \
OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \