Skip to content

Commit ff85865

Browse files
author
Sonia Zaldana Calles
committedDec 12, 2024
8346008: Fix recent NULL usage backsliding in Shenandoah
Reviewed-by: kbarrett, wkemper
1 parent 11cd639 commit ff85865

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ HeapWord* ShenandoahFreeSet::allocate_single(ShenandoahAllocRequest& req, bool&
792792
// Free set maintains mutator and collector partitions. Normally, each allocates only from its partition,
793793
// except in special cases when the collector steals regions from the mutator partition.
794794

795-
// Overwrite with non-zero (non-NULL) values only if necessary for allocation bookkeeping.
795+
// Overwrite with non-zero (non-null) values only if necessary for allocation bookkeeping.
796796

797797
switch (req.type()) {
798798
case ShenandoahAllocRequest::_alloc_tlab:

‎src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void ShenandoahGenerationalEvacuationTask::promote_in_place(ShenandoahHeapRegion
202202
while (obj_addr < tams) {
203203
oop obj = cast_to_oop(obj_addr);
204204
if (marking_context->is_marked(obj)) {
205-
assert(obj->klass() != nullptr, "klass should not be NULL");
205+
assert(obj->klass() != nullptr, "klass should not be null");
206206
// This thread is responsible for registering all objects in this region. No need for lock.
207207
scanner->register_object_without_lock(obj_addr);
208208
obj_addr += obj->size();

0 commit comments

Comments
 (0)
Please sign in to comment.