Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8335922: Incorrect @Stable usage of LambdaForm$Name.index #20178

Closed
wants to merge 8 commits into from
+23 −47
Closed

8335922: Incorrect @Stable usage of LambdaForm$Name.index #20178

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d111ba
8335922: Incorrect stable usage of LambdaForm$Name.index
liach Jul 15, 2024
0743c5f
We have sufficient space in short, use +1 offset
liach Jul 15, 2024
db80583
Encapsulate offsetIndex, share computation result
liach Jul 15, 2024
e779ce4
Revert "Encapsulate offsetIndex, share computation result"
liach Jul 15, 2024
7709d31
Revert "We have sufficient space in short, use +1 offset"
liach Jul 15, 2024
061f48d
Revert "8335922: Incorrect stable usage of LambdaForm$Name.index"
liach Jul 15, 2024
771755b
Make LambdaForm.Name index final
liach Jul 15, 2024
9846703
Update src/java.base/share/classes/java/lang/invoke/LambdaForm.java
liach Jul 16, 2024
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
7 changes: 4 additions & 3 deletions src/java.base/share/classes/java/lang/invoke/LambdaForm.java
View file
Original file line number Diff line number Diff line change
@@ -1339,7 +1339,7 @@ public static String shortenSignature(String signature) {

static final class Name {
final BasicType type;
@Stable short offsetIndex; // slot + 1, reserves 0 for unset
private @Stable short offsetIndex; // slot + 1, reserves 0 for unset
final NamedFunction function;
final Object constraint; // additional type information, if not null
@Stable final Object[] arguments;
@@ -1395,9 +1395,10 @@ private Name(Name that, Object constraint) {
BasicType type() { return type; }
int index() { return offsetIndex - 1; }
boolean initIndex(int i) {
if (offsetIndex != i + 1) {
short index = (short) (i + 1);
if (offsetIndex != index) {
if (offsetIndex != 0) return false;
offsetIndex = (short) (i + 1);
offsetIndex = index;
}
return true;
}