diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp index afe7d2acfa7e0..faaf270e8a993 100644 --- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp +++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp @@ -742,9 +742,14 @@ void BarrierSetC2::clone(GraphKit* kit, Node* src_base, Node* dst_base, Node* si } Node* n = kit->gvn().transform(ac); if (n == ac) { - const TypePtr* raw_adr_type = TypeRawPtr::BOTTOM; ac->set_adr_type(TypeRawPtr::BOTTOM); - kit->set_predefined_output_for_runtime_call(ac, ac->in(TypeFunc::Memory), raw_adr_type); + // The clone copies the entire object content. Set all memory slices + // to the clone's output so that subsequent typed loads see the + // clone's writes. Using set_predefined_output_for_runtime_call with + // TypeRawPtr::BOTTOM would only update the raw slice, leaving typed + // per-instance slices (from escape analysis) pointing to the + // pre-clone memory state via the Initialize's NarrowMemProj. + kit->set_predefined_output_for_runtime_call(ac); } else { kit->set_all_memory(n); } diff --git a/src/hotspot/share/opto/arraycopynode.cpp b/src/hotspot/share/opto/arraycopynode.cpp index 2f64482f55b5a..e03c36263c468 100644 --- a/src/hotspot/share/opto/arraycopynode.cpp +++ b/src/hotspot/share/opto/arraycopynode.cpp @@ -498,6 +498,7 @@ Node* ArrayCopyNode::array_copy_backward(PhaseGVN *phase, return phase->C->top(); } +// mem - the cumulative memory state of all stores of the decomposed clone bool ArrayCopyNode::finish_transform(PhaseGVN *phase, bool can_reshape, Node* ctl, Node *mem) { if (can_reshape) { @@ -507,13 +508,25 @@ bool ArrayCopyNode::finish_transform(PhaseGVN *phase, bool can_reshape, Node* out_mem = proj_out(TypeFunc::Memory); BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2(); - if (out_mem->outcnt() != 1 || !out_mem->raw_out(0)->is_MergeMem() || - out_mem->raw_out(0)->outcnt() != 1 || !out_mem->raw_out(0)->raw_out(0)->is_MemBar()) { + // Expected pattern: out_mem → MergeMem → MemBar, or + // out_mem → MemBar (when MergeMem was folded away). + if (out_mem->outcnt() != 1) { + assert(bs->array_copy_requires_gc_barriers(true, T_OBJECT, true, is_clone_inst(), BarrierSetC2::Optimization), "can only happen with card marking"); + return false; + } + Node* mem_use = out_mem->raw_out(0); + // Bail out unless mem_use is a MemBar, or it's a MergeMem with exactly one use that is a MemBar. + if (!(mem_use->is_MemBar() || + (mem_use->is_MergeMem() && + mem_use->outcnt() == 1 && mem_use->raw_out(0)->is_MemBar()))) { assert(bs->array_copy_requires_gc_barriers(true, T_OBJECT, true, is_clone_inst(), BarrierSetC2::Optimization), "can only happen with card marking"); return false; } - igvn->replace_node(out_mem->raw_out(0), mem); + // Replace the MergeMem (or the out_mem projection if MergeMem + // was folded) with the new memory from the decomposed clone. + Node* replace_target = mem_use->is_MergeMem() ? mem_use : out_mem; + igvn->replace_node(replace_target, mem); Node* out_ctl = proj_out(TypeFunc::Control); igvn->replace_node(out_ctl, ctl); diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestBlockArrayCopyMisaligned.java b/test/hotspot/jtreg/compiler/arraycopy/TestBlockArrayCopyMisaligned.java new file mode 100644 index 0000000000000..0d194b19078eb --- /dev/null +++ b/test/hotspot/jtreg/compiler/arraycopy/TestBlockArrayCopyMisaligned.java @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2026, 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 + * @bug 8380060 + * @summary C2 block arraycopy initial-word pick-off folds load to zero + * + * @run main/othervm -Xbatch -XX:+UseCompactObjectHeaders + * -XX:CompileCommand=compileonly,compiler.arraycopy.TestBlockArrayCopyMisaligned::test* + * compiler.arraycopy.TestBlockArrayCopyMisaligned + * @run main/othervm -Xbatch -XX:-UseCompactObjectHeaders + * -XX:CompileCommand=compileonly,compiler.arraycopy.TestBlockArrayCopyMisaligned::test* + * compiler.arraycopy.TestBlockArrayCopyMisaligned + */ + +package compiler.arraycopy; + +import java.util.Arrays; + +public class TestBlockArrayCopyMisaligned { + + // Byte array with enough data to exercise the block arraycopy path. + // The clone + substring pattern triggers a tightly-coupled allocation + // where the source is initialized via a raw arraycopy (clone) and the + // destination is a nozero allocation filled by a block arraycopy. + static final byte[] BYTES = new byte[] { + 108, 77, 120, 120, 100, 77, 105, 113, + 83, 97, 71, 108, 116, 107, 90, 71, + 72, 107, 73, 85, 54, 65, 61, 61 + }; + + // Test via String(byte[],hibyte,off,count) + substring. + // The deprecated String constructor clones the byte array via + // Arrays.copyOfRange; substring then does another copyOfRange + // on the clone, triggering the block arraycopy optimization. + static String testStringSubstring() { + String s = new String(BYTES, 0, 0, 24); + return s.substring(0, 23); + } + + // Test via explicit clone + Arrays.copyOfRange. + static byte[] testCloneCopyOfRange() { + byte[] clone = BYTES.clone(); + return Arrays.copyOfRange(clone, 0, 23); + } + + // Test via explicit clone + Arrays.copyOf. + static byte[] testCloneCopyOf() { + byte[] clone = BYTES.clone(); + return Arrays.copyOf(clone, 20); + } + + public static void main(String[] args) { + String golden = new String(BYTES, 0, 0, 23); + + for (int i = 0; i < 10_000; i++) { + // Test 1: String path + String result1 = testStringSubstring(); + if (!result1.equals(golden)) { + throw new RuntimeException("testStringSubstring: expected " + + golden + ", got " + result1); + } + + // Test 2: clone + copyOfRange + byte[] result2 = testCloneCopyOfRange(); + for (int j = 0; j < 23; j++) { + if (result2[j] != BYTES[j]) { + throw new RuntimeException("testCloneCopyOfRange: mismatch at index " + j + + ", expected " + BYTES[j] + ", got " + result2[j]); + } + } + + // Test 3: clone + copyOf + byte[] result3 = testCloneCopyOf(); + for (int j = 0; j < 20; j++) { + if (result3[j] != BYTES[j]) { + throw new RuntimeException("testCloneCopyOf: mismatch at index " + j + + ", expected " + BYTES[j] + ", got " + result3[j]); + } + } + } + } +}