Skip to content

Commit 4a2cd36

Browse files
committed
8252853: AArch64: gc/shenandoah/TestVerifyJCStress.java fails intermittently with C1
Reviewed-by: zgu, rkennke Backport-of: 4fb1980
1 parent 519894a commit 4a2cd36

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,9 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembl
263263

264264
void ShenandoahBarrierSetAssembler::iu_barrier(MacroAssembler* masm, Register dst, Register tmp) {
265265
if (ShenandoahIUBarrier) {
266-
// Save possibly live regs.
267-
RegSet live_regs = RegSet::range(r0, r4) - dst;
268-
__ push(live_regs, sp);
269-
__ strd(v0, __ pre(sp, 2 * -wordSize));
270-
266+
__ push_call_clobbered_registers();
271267
satb_write_barrier_pre(masm, noreg, dst, rthread, tmp, true, false);
272-
273-
// Restore possibly live regs.
274-
__ ldrd(v0, __ post(sp, 2 * wordSize));
275-
__ pop(live_regs, sp);
268+
__ pop_call_clobbered_registers();
276269
}
277270
}
278271

test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
2+
* Copyright (c) 2017, 2020, Red Hat, Inc. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
34
*
45
* This code is free software; you can redistribute it and/or modify it
56
* under the terms of the GNU General Public License version 2 only, as
@@ -71,6 +72,11 @@
7172
* -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
7273
* -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers
7374
* TestVerifyJCStress
75+
*
76+
* @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
77+
* -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
78+
* -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:TieredStopAtLevel=1
79+
* TestVerifyJCStress
7480
*/
7581

7682
import java.util.*;

0 commit comments

Comments
 (0)