stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8182050: assert(_whole_heap.contains(p)) failed: Attempt to access p out of bounds of card marking array's _whole_heap

Browse Source 
Ignore zero-sized MemRegions to invalidate in G1SATBCardTableLoggingModRefBS::invalidate()

Reviewed-by: ehelin, sjohanss
This commit is contained in:
Thomas Schatzl 2017-11-23 15:51:06 +01:00
parent 22d7ce52bb
commit c5ce7408b3
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.cpp
View File

@ -175,6 +175,9 @@ void G1SATBCardTableLoggingModRefBS::write_ref_field_post_slow(volatile jbyte* b
void
G1SATBCardTableLoggingModRefBS::invalidate(MemRegion mr) {
if (mr.is_empty()) {
return;
}
volatile jbyte* byte = byte_for(mr.start());
jbyte* last_byte = byte_for(mr.last());
Thread* thr = Thread::current();

54
test/hotspot/jtreg/gc/g1/TestInvalidateArrayCopy.java Normal file
View File

@ -0,0 +1,54 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test TestInvalidateArrayCopy
* @bug 8182050
* @summary Check that benign (0-sized) out of heap bounds card table invalidations do not assert.
* @requires vm.gc.G1
* @requires vm.debug
* @key gc
* @run main/othervm -XX:NewSize=1M -Xlog:gc -XX:MaxNewSize=1m -XX:-UseTLAB -XX:OldSize=63M -XX:MaxHeapSize=64M TestInvalidateArrayCopy
*/
// The test allocates zero-sized arrays of j.l.O and tries to arraycopy random data into it so
// that the asserting post barrier calls are executed. It assumes that G1 allocates eden regions
// at the top of the heap for this problem to occur.
public class TestInvalidateArrayCopy {
static final int NumIterations = 1000000;
// "Random" source data to "copy" into the target.
static Object[] sourceArray = new Object[10];
public static void main(String[] args) {
for (int i = 0; i < NumIterations; i++) {
Object[] x = new Object[0];
// Make sure that the compiler can't optimize out the above allocations.
if (i % (NumIterations / 10) == 0) {
System.out.println(x);
}
System.arraycopy(sourceArray, 0, x, 0, Math.min(x.length, sourceArray.length));
}
}
}