Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/hotspot/share/opto/inlinetypenode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,9 @@ Node* InlineTypeNode::field_value_by_offset(int offset, bool recursive) const {
assert(!field->is_flat() || field->type()->is_inlinetype(), "must be an inline type");

if (!recursive || !field->is_flat() || value->is_top()) {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks a bit cluttered, can we move if (value->is_top()) into a separate case before this if instead?

Copy link
Copy Markdown
Member Author

@TobiHartmann TobiHartmann May 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I had this version first and didn't like it but I don't have a strong opinion. Updated.

assert(offset == field->offset_in_bytes(), "offset mismatch");
// If the graph is dying (value is top), a load may still ask for a nested
// field inside a flattened field before the dead load itself is folded away.
assert((offset == field->offset_in_bytes()) || (value->is_top() && field->is_flat()), "offset mismatch");
return value;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* 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.
*/

package compiler.valhalla.inlinetypes;

import jdk.internal.vm.annotation.LooselyConsistentValue;
import jdk.internal.vm.annotation.NullRestricted;

/*
* @test
* @summary Test loads from a dead InlineTypeNode with top field values.
* @requires vm.compiler2.enabled
* @enablePreview
* @modules java.base/jdk.internal.vm.annotation
* @run main ${test.main.class}
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions
* -XX:+StressIGVN -XX:StressSeed=8 -XX:+AlwaysIncrementalInline
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The hardcoded is on purpose? It reproduces so rarely otherwise?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's on purpose to make it reliably reproduce the issue and the usual way of how we design these tests. I.e. one run with fixed seed and one without. As we discussed offline, there are several alternatives to this approach, including RepeatCompilation etc. We decided on the current approach a while ago but we can surely revisit. It's out of scope of this PR though 🙂

Testing also revealed that PreloadClasses is required to make sure that the @NullRestricted annotation is respected, so I added a corresponding @requires.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that means this test lacks a test that does not use a fixed seed?

* ${test.main.class}
*/
public value class TestDeadInlineTypeFieldOffset {
MyValue valueField1;
@NullRestricted
MyValue valueField2;

TestDeadInlineTypeFieldOffset(MyValue valueField1, MyValue valueField2) {
this.valueField1 = valueField1;
this.valueField2 = valueField2;
}

TestDeadInlineTypeFieldOffset test1() {
return new TestDeadInlineTypeFieldOffset(null, valueField2);
}

TestDeadInlineTypeFieldOffset test2() {
return new TestDeadInlineTypeFieldOffset(valueField1, null);
}

@LooselyConsistentValue
static value class NestedValue {
int x;
int y;

NestedValue(int x, int y) {
this.x = x;
this.y = y;
}
}

@LooselyConsistentValue
static value class MyValue {
NestedValue v1;
@NullRestricted
NestedValue v2;

MyValue(NestedValue v1, NestedValue v2) {
this.v1 = v1;
this.v2 = v2;
}
}

static TestDeadInlineTypeFieldOffset test(TestDeadInlineTypeFieldOffset vt) {
vt = vt.test1();
try {
vt = vt.test2();
throw new RuntimeException();
} catch (NullPointerException e) {
// Expected.
}
return vt;
}

public static void main(String[] args) {
MyValue val = new MyValue(null, new NestedValue(5, 6));
TestDeadInlineTypeFieldOffset vt = new TestDeadInlineTypeFieldOffset(null, val);
for (int i = 0; i < 10_000; ++i) {
vt = test(vt);
}
}
}