Skip to content

Commit 6644d31

Browse files
committed
Pass all three arguments in barrier slow path
fop working with interpreter and c1, but not c2 MMTK_PLAN=GenCopy /mnt/jdk/build/linux-riscv64-server-slowdebug/jdk/bin/java -XX:+UseThirdPartyHeap -XX:MetaspaceSize=1G -XX:+UnlockDiagnosticVMOptions -Xint -Xmx60M -Xms60M -jar /mnt/dacapo/dacapo-evaluation-git-f480064.jar fop MMTK_PLAN=GenCopy /mnt/jdk/build/linux-riscv64-server-slowdebug/jdk/bin/java -XX:+UseThirdPartyHeap -XX:MetaspaceSize=1G -XX:+UnlockDiagnosticVMOptions -XX:TieredStopAtLevel=1 -Xmx60M -Xms60M -jar /mnt/dacapo/dacapo-evaluation-git-f480064.jar fop MMTK_PLAN=GenCopy /mnt/jdk/build/linux-riscv64-server-slowdebug/jdk/bin/java -XX:+UseThirdPartyHeap -XX:MetaspaceSize=1G -XX:+UnlockDiagnosticVMOptions -Xcomp -XX:-TieredCompilation -Xmx60M -Xms60M -jar /mnt/dacapo/dacapo-evaluation-git-f480064.jar fop # Internal Error (/home/zixianc/mmtk-riscv/jdk-mmtk/src/hotspot/share/opto/matcher.cpp:1791), pid=2110, tid=2134 # assert(C->node_arena()->contains(s->_leaf) || !has_new_node(s->_leaf)) failed: duplicating node that's already been matched
1 parent 05ce800 commit 6644d31

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

openjdk/cpu/riscv/mmtkObjectBarrierSetAssembler_riscv.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ void MMTkObjectBarrierSetAssembler::object_reference_write_post(MacroAssembler*
7373
__ bind(done);
7474
#else
7575
__ mv(c_rarg0, obj);
76-
// __ la(c_rarg1, dst);
77-
// __ mv(c_rarg2, val == noreg ? zr : val);
76+
__ la(c_rarg1, dst);
77+
__ mv(c_rarg2, val == noreg ? zr : val);
7878
__ call_VM_leaf_base(FN_ADDR(MMTkBarrierSetRuntime::object_reference_write_post_call), 3);
7979
#endif
8080
if (dst.base()->is_valid()) {

0 commit comments

Comments
 (0)