Skip to content

Commit 691db5d

Browse files
committed
8317592: Serial: Remove Space::toContiguousSpace
Reviewed-by: tschatzl, iwalulya
1 parent ec9ba5d commit 691db5d

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

src/hotspot/share/gc/serial/cardTableRS.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
class DirtyCardToOopClosure: public MemRegionClosure {
5454
protected:
5555
OopIterateClosure* _cl;
56-
Space* _sp;
56+
TenuredSpace* _sp;
5757
HeapWord* _min_done; // Need a downwards traversal to compensate
5858
// imprecise write barrier; this is the
5959
// lowest location already done (or,
@@ -88,7 +88,7 @@ class DirtyCardToOopClosure: public MemRegionClosure {
8888
HeapWord* bottom, HeapWord* top,
8989
OopIterateClosure* cl);
9090
public:
91-
DirtyCardToOopClosure(Space* sp, OopIterateClosure* cl) :
91+
DirtyCardToOopClosure(TenuredSpace* sp, OopIterateClosure* cl) :
9292
_cl(cl), _sp(sp), _min_done(nullptr) {
9393
NOT_PRODUCT(_last_bottom = nullptr);
9494
}
@@ -98,7 +98,7 @@ class DirtyCardToOopClosure: public MemRegionClosure {
9898

9999
HeapWord* DirtyCardToOopClosure::get_actual_top(HeapWord* top,
100100
HeapWord* top_obj) {
101-
if (top_obj != nullptr && top_obj < (_sp->toContiguousSpace())->top()) {
101+
if (top_obj != nullptr && top_obj < _sp->top()) {
102102
if (cast_to_oop(top_obj)->is_objArray() || cast_to_oop(top_obj)->is_typeArray()) {
103103
// An arrayOop is starting on the dirty card - since we do exact
104104
// store checks for objArrays we are done.
@@ -111,7 +111,7 @@ HeapWord* DirtyCardToOopClosure::get_actual_top(HeapWord* top,
111111
top = top_obj + cast_to_oop(top_obj)->size();
112112
}
113113
} else {
114-
top = (_sp->toContiguousSpace())->top();
114+
top = _sp->top();
115115
}
116116
return top;
117117
}

src/hotspot/share/gc/shared/space.hpp

-11
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,6 @@ class Space: public CHeapObj<mtGC> {
211211
virtual void print_short() const;
212212
virtual void print_short_on(outputStream* st) const;
213213

214-
215-
// IF "this" is a ContiguousSpace, return it, else return null.
216-
virtual ContiguousSpace* toContiguousSpace() {
217-
return nullptr;
218-
}
219-
220214
// Debugging
221215
virtual void verify() const = 0;
222216
};
@@ -415,11 +409,6 @@ class ContiguousSpace: public Space {
415409

416410
void print_on(outputStream* st) const override;
417411

418-
// Checked dynamic downcasts.
419-
ContiguousSpace* toContiguousSpace() override {
420-
return this;
421-
}
422-
423412
// Debugging
424413
void verify() const override;
425414
};

0 commit comments

Comments
 (0)