infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

8332245: C2: missing record_for_ign() call in GraphKit::must_be_not_null()

Browse Source 
Reviewed-by: thartmann, chagedorn
This commit is contained in:
Roland Westrelin 2024-05-15 12:01:20 +00:00
parent fa043aec42
commit 8032d640c0
2 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/opto/graphKit.cpp
View File

@ -1468,6 +1468,9 @@ Node* GraphKit::must_be_not_null(Node* value, bool do_replace_in_map) {
Node* opaq = _gvn.transform(new Opaque4Node(C, tst, intcon(1)));
IfNode *iff = new IfNode(control(), opaq, PROB_MAX, COUNT_UNKNOWN);
_gvn.set_type(iff, iff->Value(&_gvn));
if (!tst->is_Con()) {
record_for_igvn(iff);
}
Node *if_f = _gvn.transform(new IfFalseNode(iff));
Node *frame = _gvn.transform(new ParmNode(C->start(), TypeFunc::FramePtr));
Node* halt = _gvn.transform(new HaltNode(if_f, frame, "unexpected null in intrinsic"));

74
test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java Normal file
View File

@ -0,0 +1,74 @@
/*
* Copyright (c) 2024, Red Hat, Inc. 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 8332245
* @summary C2: missing record_for_ign() call in GraphKit::must_be_not_null()
*
* @modules java.base/jdk.internal.misc
* @library /test/lib /
* @run driver compiler.c2.irTests.TestBackToBackMustBeNotNull
*/
package compiler.c2.irTests;
import jdk.internal.misc.Unsafe;
import java.lang.reflect.Field;
import compiler.lib.ir_framework.*;
public class TestBackToBackMustBeNotNull {
static final jdk.internal.misc.Unsafe UNSAFE = Unsafe.getUnsafe();
static final long F_OFFSET;
private static A fieldA = new A();
static {
try {
Field fField = A.class.getDeclaredField("f");
F_OFFSET = UNSAFE.objectFieldOffset(fField);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
static public void main(String[] args) {
TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED");
}
@Test
@IR(phase = { CompilePhase.ITER_GVN1 }, counts = { IRNode.IF, "1" })
private static void test1() {
final Object o1 = UNSAFE.getReference(fieldA, F_OFFSET);
final Object o2 = UNSAFE.getReference(fieldA, F_OFFSET);
notInlined(o1, o2);
}
@DontInline
private static void notInlined(Object o1, Object o2) {
}
static class A {
Object f;
}
}