From 83f3d42d6bcefac80449987f4d951f8280eeee3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?= <rcastanedalo@openjdk.org> Date: Wed, 6 Nov 2024 09:17:21 +0000 Subject: [PATCH] 8339303: C2: dead node after failing to match cloned address expression Reviewed-by: vlivanov, kvn --- src/hotspot/cpu/x86/x86.ad | 3 +- src/hotspot/share/opto/matcher.cpp | 12 ++-- .../compiler/c2/TestMatcherTwoImmOffsets.java | 61 +++++++++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/c2/TestMatcherTwoImmOffsets.java diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad index f980643396f..d135c7bacfa 100644 --- a/src/hotspot/cpu/x86/x86.ad +++ b/src/hotspot/cpu/x86/x86.ad @@ -2512,11 +2512,12 @@ bool Matcher::pd_clone_address_expressions(AddPNode* m, Matcher::MStack& mstack, address_visited.test_set(m->_idx); // Flag as address_visited Node *adr = m->in(AddPNode::Address); - // Intel can handle 2 adds in addressing mode + // Intel can handle 2 adds in addressing mode, with one of them using an immediate offset. // AtomicAdd is not an addressing expression. // Cheap to find it by looking for screwy base. if (adr->is_AddP() && !adr->in(AddPNode::Base)->is_top() && + !adr->in(AddPNode::Offset)->is_Con() && LP64_ONLY( off->get_long() == (int) (off->get_long()) && ) // immL32 // Are there other uses besides address expressions? !is_visited(adr)) { diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp index 920178a0d04..0d29412dc29 100644 --- a/src/hotspot/share/opto/matcher.cpp +++ b/src/hotspot/share/opto/matcher.cpp @@ -170,17 +170,19 @@ void Matcher::verify_new_nodes_only(Node* xroot) { worklist.push(xroot); while (worklist.size() > 0) { Node* n = worklist.pop(); - visited.set(n->_idx); + if (visited.test_set(n->_idx)) { + continue; + } assert(C->node_arena()->contains(n), "dead node"); for (uint j = 0; j < n->req(); j++) { Node* in = n->in(j); if (in != nullptr) { - assert(C->node_arena()->contains(in), "dead node"); - if (!visited.test(in->_idx)) { - worklist.push(in); - } + worklist.push(in); } } + for (DUIterator_Fast jmax, j = n->fast_outs(jmax); j < jmax; j++) { + worklist.push(n->fast_out(j)); + } } } #endif diff --git a/test/hotspot/jtreg/compiler/c2/TestMatcherTwoImmOffsets.java b/test/hotspot/jtreg/compiler/c2/TestMatcherTwoImmOffsets.java new file mode 100644 index 00000000000..16b9dc079a4 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestMatcherTwoImmOffsets.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2024, 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 8339303 + * @summary Test that the matcher does not create dead nodes when matching + * address expressions with two immediate offsets. + * @requires os.maxMemory > 4G + * + * @run main/othervm -Xmx4g -Xbatch -XX:-TieredCompilation + * -XX:CompileOnly=compiler.c2.TestMatcherTwoImmOffsets::test + * compiler.c2.TestMatcherTwoImmOffsets + */ + +package compiler.c2; + +public class TestMatcherTwoImmOffsets { + static final int[] a1 = new int[10]; + int[] a2; + static TestMatcherTwoImmOffsets o = new TestMatcherTwoImmOffsets(); + + public static void test() { + for (int i = 0; i < 10; i++) { + for (int j = 0; j < 100; j++) { + int[][] nArray = new int[10][]; + for (int k = 0; k < nArray.length; k++) {} + } + for (long j = 1L; j < 3L; j++) { + a1[(int) j]--; + } + o.a2 = a1; + } + } + + public static void main(String[] args) { + for (int i = 0; i < 10; i++) { + test(); + } + } +}