8321941: Migrate test/jdk/valhalla/valuetypes from primitive classes to null-restricted types #963

mlchung · 2023-12-13T01:28:58Z

Migrate test/jdk/valhalla/valuetypes tests to use null-restricted types instead.

Progress

Change must not contain extraneous whitespace

Issue

JDK-8321941: Migrate test/jdk/valhalla/valuetypes from primitive classes to null-restricted types (Enhancement - P3)

Reviewers

Roger Riggs (@RogerRiggs - Committer) ⚠️ Review applies to d8683abd

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/963/head:pull/963
$ git checkout pull/963

Update a local copy of the PR:
$ git checkout pull/963
$ git pull https://git.openjdk.org/valhalla.git pull/963/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 963

View PR using the GUI difftool:
$ git pr show -t 963

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/963.diff

Webrev

Link to Webrev Comment

…ctly in LF

bridgekeeper · 2023-12-13T01:30:13Z

👋 Welcome back mchung! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-12-13T01:32:16Z

@mlchung This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8321941: Migrate test/jdk/valhalla/valuetypes from primitive classes to null-restricted types

Reviewed-by: rriggs

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the lworld branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

mlbridge · 2023-12-13T01:36:34Z

Webrevs

liach · 2023-12-13T02:26:16Z

src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java

        final int PRE_CAST  = (needsCast && !isGetter ? nameCursor++ : -1);
        final int LINKER_CALL = nameCursor++;
+        final int FIELD_TYPE = (needsZeroInstance && isGetter ? nameCursor++ : -1);
+        final int ZERO_INSTANCE = (needsZeroInstance && isGetter ? nameCursor++ : -1);
        final int POST_CAST = (needsCast && isGetter ? nameCursor++ : -1);
        final int RESULT    = nameCursor-1;  // either the call or the cast


Outdated comment, should be

// the call, the zero instance, or the cast

RogerRiggs · 2023-12-13T16:45:19Z

test/jdk/valhalla/valuetypes/ArrayElementVarHandleTest.java

- * @run testng/othervm -XX:+EnableValhalla -XX:+EnablePrimitiveClasses -XX:FlatArrayElementMaxSize=-1 ArrayElementVarHandleTest
- * @run testng/othervm -XX:+EnableValhalla -XX:+EnablePrimitiveClasses -XX:FlatArrayElementMaxSize=0  ArrayElementVarHandleTest
+ * @run junit/othervm -XX:+EnableValhalla -XX:FlatArrayElementMaxSize=-1 ArrayElementVarHandleTest
+ * @run testng/othervm -XX:+EnableValhalla -XX:FlatArrayElementMaxSize=0  ArrayElementVarHandleTest


junit here too?

RogerRiggs · 2023-12-13T17:00:49Z

test/jdk/valhalla/valuetypes/ObjectMethods.java

+
+    static Stream<Arguments> identitiesData() {
+        return Stream.of(
+                Arguments.of(new Object(), false, false),


The JEP doesn't say this (yet) but new Object() is an identity instance. java.util.Objects.isIdentityObject() and .isValueObject() will need to be updated too.

It already handles that. The two arguments specify if the class of the instance is identity class or value class. The test special cases to verify if the class is Object.class, it's an identity object.

RogerRiggs · 2023-12-13T17:26:17Z

test/jdk/valhalla/valuetypes/ArrayElementVarHandleTest.java

@@ -24,116 +24,93 @@

 /*
 * @test
- * @summary test VarHandle on primitive class array
+ * @summary test VarHandle on value class array
 * @compile -XDenablePrimitiveClasses ArrayElementVarHandleTest.java


It looks like the compiler does not need -XDenablePrimitiveClasses.
Except in RecursiveValueClass.java that still has a primitive class declaration.

RogerRiggs · 2023-12-13T21:12:37Z

test/jdk/valhalla/valuetypes/LambdaMetaFactory/LambdaTest.java

@@ -23,62 +23,64 @@

 /*
 * @test
+ * @run junit/othervm -XX:+EnableValhalla LambdaTest


Just style suggestion in the order of jtreg tags, @summary should come before @run

Hmm... we have a mixture of style. The jtreg document states @summary comes before the action. I will update them.

mlchung · 2023-12-14T17:14:47Z

/integrate

openjdk · 2023-12-14T17:16:26Z

Going to push as commit 2dc05aa.

openjdk · 2023-12-14T17:16:33Z

@mlchung Pushed as commit 2dc05aa.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

mlchung added 5 commits December 7, 2023 15:48

Migrate libraries tests to null-restricted (part 1)

cc0dcff

Replace Unsafe::getNullRestrictedReference and call zeroInstance dire…

5f9fd6d

…ctly in LF

Migrate tests to value types (part 2)

447efcb

clean up

d6f1391

more clean up

d8e9e68

openjdk bot added ready rfr labels Dec 13, 2023

liach reviewed Dec 13, 2023

View reviewed changes

RogerRiggs reviewed Dec 13, 2023

View reviewed changes

Remove @compile

d8683ab

RogerRiggs approved these changes Dec 13, 2023

View reviewed changes

move @summary before @run

1eb6a6d

openjdk bot added the integrated label Dec 14, 2023

openjdk bot closed this Dec 14, 2023

openjdk bot removed ready rfr labels Dec 14, 2023

mlchung deleted the migrate-tests branch April 15, 2024 20:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8321941: Migrate test/jdk/valhalla/valuetypes from primitive classes to null-restricted types #963

8321941: Migrate test/jdk/valhalla/valuetypes from primitive classes to null-restricted types #963

mlchung commented Dec 13, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Dec 13, 2023

openjdk bot commented Dec 13, 2023 •

edited

Loading

mlbridge bot commented Dec 13, 2023 •

edited

Loading

liach Dec 13, 2023

RogerRiggs Dec 13, 2023

RogerRiggs Dec 13, 2023

mlchung Dec 13, 2023

RogerRiggs Dec 13, 2023

mlchung Dec 13, 2023

RogerRiggs Dec 13, 2023

mlchung Dec 13, 2023

mlchung commented Dec 14, 2023

openjdk bot commented Dec 14, 2023

openjdk bot commented Dec 14, 2023

8321941: Migrate test/jdk/valhalla/valuetypes from primitive classes to null-restricted types #963

8321941: Migrate test/jdk/valhalla/valuetypes from primitive classes to null-restricted types #963

Conversation

mlchung commented Dec 13, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Dec 13, 2023

openjdk bot commented Dec 13, 2023 • edited Loading

mlbridge bot commented Dec 13, 2023 • edited Loading

Webrevs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mlchung commented Dec 14, 2023

openjdk bot commented Dec 14, 2023

openjdk bot commented Dec 14, 2023

mlchung commented Dec 13, 2023 •

edited by openjdk bot

Loading

openjdk bot commented Dec 13, 2023 •

edited

Loading

mlbridge bot commented Dec 13, 2023 •

edited

Loading