Skip to content

Commit

Permalink
8290374: Shenandoah: Remove inaccurate comment on SBS::load_reference…
Browse files Browse the repository at this point in the history
…_barrier()

Backport-of: 011958d30b275f0f6a2de097938ceeb34beb314d
  • Loading branch information
shipilev committed Nov 21, 2022
1 parent 728dc4d commit 7a111ea
Showing 1 changed file with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2021, Red Hat, Inc. All rights reserved.
* Copyright (c) 2015, 2022, Red Hat, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -84,13 +84,8 @@ inline oop ShenandoahBarrierSet::load_reference_barrier(oop obj) {
_heap->in_collection_set(obj)) { // Subsumes NULL-check
assert(obj != NULL, "cset check must have subsumed NULL-check");
oop fwd = resolve_forwarded_not_null(obj);
// TODO: It should not be necessary to check evac-in-progress here.
// We do it for mark-compact, which may have forwarded objects,
// and objects in cset and gets here via runtime barriers.
// We can probably fix this as soon as mark-compact has its own
// marking phase.
if (obj == fwd && _heap->is_evacuation_in_progress()) {
Thread* t = Thread::current();
Thread* t = Thread::current();
ShenandoahEvacOOMScope oom_evac_scope(t);
return _heap->evacuate_object(obj, t);
}
Expand Down

1 comment on commit 7a111ea

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.