8260606: Update Valhalla core-libs naming for methods related to primitive classes #318

RogerRiggs · 2021-02-02T20:55:07Z

Update terminology used to refer to primitive classes (from inline classes).
Drop the descriptions using "projection" and use "conversion" as needed.
Updated dependencies on Class.isPrimitiveClass().

[Updating test names will be a separate task.]

Progress

Change must not contain extraneous whitespace

Issue

JDK-8260606: Update Valhalla core-libs naming for methods related to primitive classes

Reviewers

Mandy Chung (@mlchung - Committer)

Download

$ git fetch https://git.openjdk.java.net/valhalla pull/318/head:pull/318
$ git checkout pull/318

…itive classes

bridgekeeper · 2021-02-02T20:56:16Z

👋 Welcome back rriggs! 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 · 2021-02-02T20:57:12Z

@RogerRiggs 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:

8260606: Update Valhalla core-libs naming for methods related to primitive classes

Reviewed-by: mchung

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 · 2021-02-02T21:01:08Z

Webrevs

01: Full (49f006b)
00: Full (8655ec7)

mlchung · 2021-02-03T19:07:56Z

src/java.base/share/classes/java/lang/Class.java

     *
-     * @return {@code true} if this class is an inline class
+     * @return {@code true} if this class is a primitive class, otherwise false


Nit: s/false/{@code false}/

mlchung · 2021-02-03T19:18:23Z

src/java.base/share/classes/java/lang/Class.java

     * is returned.
     */
-    private Class<?>[] newProjectionTypeArray() {
+    private Class<?>[] newPrimitiveTypeArray() {


perhaps rename to newTypeArrayForPrimitiveClass

mlchung · 2021-02-03T19:19:54Z

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

@@ -552,17 +552,17 @@ private static LinkageError newLinkageError(Throwable e) {
    };

    /**
-     * Invoke the bootstrap methods hashCode for the given inline object.
+     * Invoke the bootstrap methods hashCode for the given primitive classobject.


a space is missing in classobject

mlchung · 2021-02-03T19:20:07Z

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

     * @param o the instance to hash.
-     * @return the hash code of the given inline object.
+     * @return the hash code of the given primitive classobject.


space is missing in the word classobject

mlchung · 2021-02-03T19:20:28Z

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

     * @param o the instance to hash.
-     * @return the string representation of the given inline object.
+     * @return the string representation of the given primitive classobject.


same typo classobject

mlchung · 2021-02-03T19:23:00Z

src/java.base/share/classes/jdk/internal/misc/Unsafe.java

            // return an uninitialized default value if null
-            ref = uninitializedDefaultValue(vc);
+            ref = uninitializedDefaultValue(pc);
        }
        return ref;
    }

    public Object getReferenceVolatile(Object o, long offset, Class<?> vc) {


vc parameter should also be renamed to pc to be consistent with other methods.

mlchung

Looks good. Do you want to add IdentityObject in a separate PR? It's okay with me to add this in this PR.

openjdk · 2021-02-03T19:25:33Z

@RogerRiggs this pull request can not be integrated into lworld due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8251554-rename-primitiveclass
git fetch https://git.openjdk.java.net/valhalla lworld
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge lworld"
git push

RogerRiggs · 2021-02-03T19:50:30Z

Looks good. Do you want to add IdentityObject in a separate PR? It's okay with me to add this in this PR.

IdentityObject is already in java.lang.

java.lang.PrimitiveObject has not yet been added.

mlchung · 2021-02-03T19:58:13Z

Looks good. Do you want to add IdentityObject in a separate PR? It's okay with me to add this in this PR.

IdentityObject is already in java.lang.

java.lang.PrimitiveObject has not yet been added.

I meant PrimitiveObject (sorry for the typo).

…251554-rename-primitiveclass

RogerRiggs · 2021-02-05T17:24:16Z

/integrate

openjdk · 2021-02-05T17:25:05Z

@RogerRiggs Since your change was applied there have been 233 commits pushed to the lworld branch:

ddfba61: 8261226: [lworld] Array access profiling should be disabled at compilation level 1 and 2
ce486c3: 8261037: [lworld] Assert during C2 compilation due to inconsistent JVMState at safepoint
33dc4fb: Merge jdk
f025bc1: 8260301: misc gc/g1/unloading tests fails with "RuntimeException: Method could not be enqueued for compilation at level N"
4a8b5c1: 8257858: [macOS]: Remove JNF dependency from libosxsecurity/KeystoreImpl.m
472bf62: 8258799: [Testbug] RandomCommandsTest must check if tested directive is added via jcmd
b0ee7a8: 8241995: Clarify InetSocketAddress::toString specification
0ef93fe: 8259265: Refactor UncaughtExceptions shell test as java test.
5324b5c: 8260998: Shenandoah: Restore reference processing statistics reporting
c8de943: 8260617: Merge ZipFile encoding check with the initial hash calculation
... and 223 more: https://git.openjdk.java.net/valhalla/compare/fbb8a6bdf878d2c370a0e78b04a5a5736f2eb765...lworld

Your commit was automatically rebased without conflicts.

Pushed as commit 5f1e8d9.

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

8260606: Update Valhalla core-libs naming for methods related to prim…

8655ec7

…itive classes

openjdk bot added ready rfr labels Feb 2, 2021

mlchung reviewed Feb 3, 2021

View reviewed changes

mlchung approved these changes Feb 3, 2021

View reviewed changes

openjdk bot added merge-conflict and removed ready rfr labels Feb 3, 2021

Updates per review comments

0ac8963

Merge branch 'lworld' of https://git.openjdk.java.net/valhalla into 8…

49f006b

…251554-rename-primitiveclass

openjdk bot added ready rfr and removed merge-conflict labels Feb 3, 2021

mlchung approved these changes Feb 3, 2021

View reviewed changes

openjdk bot closed this Feb 5, 2021

openjdk bot added integrated and removed ready rfr labels Feb 5, 2021

RogerRiggs deleted the 8251554-rename-primitiveclass branch March 14, 2023 18:42

8260606: Update Valhalla core-libs naming for methods related to primitive classes #318

8260606: Update Valhalla core-libs naming for methods related to primitive classes #318

RogerRiggs commented Feb 2, 2021 •

edited by openjdk bot

bridgekeeper bot commented Feb 2, 2021

openjdk bot commented Feb 2, 2021 •

edited

mlbridge bot commented Feb 2, 2021 •

edited

mlchung Feb 3, 2021

mlchung Feb 3, 2021 •

edited

mlchung Feb 3, 2021

mlchung Feb 3, 2021

mlchung Feb 3, 2021

mlchung Feb 3, 2021

mlchung left a comment

openjdk bot commented Feb 3, 2021

RogerRiggs commented Feb 3, 2021

mlchung commented Feb 3, 2021

RogerRiggs commented Feb 5, 2021

openjdk bot commented Feb 5, 2021

8260606: Update Valhalla core-libs naming for methods related to primitive classes #318

8260606: Update Valhalla core-libs naming for methods related to primitive classes #318

Conversation

RogerRiggs commented Feb 2, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Feb 2, 2021

openjdk bot commented Feb 2, 2021 • edited

mlbridge bot commented Feb 2, 2021 • edited

Webrevs

mlchung Feb 3, 2021

Choose a reason for hiding this comment

mlchung Feb 3, 2021 • edited

Choose a reason for hiding this comment

mlchung Feb 3, 2021

Choose a reason for hiding this comment

mlchung Feb 3, 2021

Choose a reason for hiding this comment

mlchung Feb 3, 2021

Choose a reason for hiding this comment

mlchung Feb 3, 2021

Choose a reason for hiding this comment

mlchung left a comment

Choose a reason for hiding this comment

openjdk bot commented Feb 3, 2021

RogerRiggs commented Feb 3, 2021

mlchung commented Feb 3, 2021

RogerRiggs commented Feb 5, 2021

openjdk bot commented Feb 5, 2021

RogerRiggs commented Feb 2, 2021 •

edited by openjdk bot

openjdk bot commented Feb 2, 2021 •

edited

mlbridge bot commented Feb 2, 2021 •

edited

mlchung Feb 3, 2021 •

edited