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.

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

mlrules: applying off-list suggestions #746

Closed
wants to merge 11 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Aug 27, 2020

Hi all,

In this PR I'll collect the various updates to the jdk mailing list rules file that I'm receiving off-list (which is perfectly fine, feel free to send plain suggestions my way and I'll collect them here!)

Best regards,
Robin


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Reviewers

  • Erik Helin (ehelin - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/skara pull/746/head:pull/746
$ git checkout pull/746

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 27, 2020

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@openjdk openjdk bot added the rfr label Aug 27, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 27, 2020

@AlanBateman
Copy link

@AlanBateman AlanBateman commented Aug 27, 2020

Thanks, looks good!

@edvbld
Copy link
Member

@edvbld edvbld commented Aug 27, 2020

I got the feedback from a build-dev maintainer off-list that the following for build-dev:

            "bin/idea.sh",
            "bin/jib.sh",
            "bin/unshuffle_list.txt",
            "configure",
            "doc/building.html",
            "doc/building.md",
            "doc/ide.html",
            "doc/ide.md",
            "doc/testing.html",
            "doc/testing.md",

can be simplified to just:

             "bin/",
             "doc/",

@edvbld
Copy link
Member

@edvbld edvbld commented Aug 27, 2020

Comment from GC maintainer regarding hotspot-gc-dev - change:

"src/hotspot/share/memory/(heap|oop)",

into

"src/hotspot/share/memory/oop",

The files src/hotspot/share/memory/heap.{hpp,cpp} actually for the code heap (and are thus most often reviewed on hotspot-compiler-dev). As a GC reviewer I should have caught this too 😄

@edvbld
Copy link
Member

@edvbld edvbld commented Aug 28, 2020

I received the following feedback regarding hotspot-compiler-dev - change:

src/jdk.aot/share/classes/jdk.tools.jaotc

into just

src/jdk.aot/

and add the following files:

src/hotspot/share/runtime/icache.cpp
src/hotspot/share/runtime/icache.hpp
src/hotspot/share/runtime/registerMap.hpp
src/hotspot/share/runtime/sharedRuntime.cpp
src/hotspot/share/runtime/sharedRuntime.hpp
src/hotspot/share/runtime/sharedRuntimeMath.hpp
src/hotspot/share/runtime/sharedRuntimeTrans.cpp
src/hotspot/share/runtime/sharedRuntimeTrig.cpp
src/hotspot/share/runtime/stubCodeGenerator.hpp
src/hotspot/share/runtime/sweeper.cpp
src/hotspot/share/runtime/sweeper.hpp
src/hotspot/share/runtime/vframe.cpp
src/hotspot/share/runtime/vframe.hpp
src/hotspot/share/runtime/vframe.inline.hpp
src/hotspot/share/runtime/vframeArray.cpp
src/hotspot/share/runtime/vframeArray.hpp
src/hotspot/share/runtime/vframe_hp.cpp
src/hotspot/share/runtime/vframe_hp.hpp

As stated in another comment, the following files should also be for hotspot-compiler-dev:

src/hotspot/share/memory/heap.hpp
src/hotspot/share/memory/heap.inline.hpp
src/hotspot/share/memory/heap.cpp

@edvbld
Copy link
Member

@edvbld edvbld commented Aug 28, 2020

Additional suggestion to add the following for "jdk-dev":

README.md
CONTRIBUTING.md
LICENSE
ASSEMBLY_EXCEPTION
ADDITIONAL_LICENSE_INFO

@edvbld
Copy link
Member

@edvbld edvbld commented Aug 28, 2020

Furthermore, please drop the -dev suffix from the labels, that can be inferred 👍

@edvbld
Copy link
Member

@edvbld edvbld commented Aug 28, 2020

I think the Shenandoah project want shenandoah-dev to be CC:d for changes to files in src/hotspot/share/gc/shenandoah. See https://mail.openjdk.java.net/pipermail/hotspot-gc-dev/2020-August/030527.html for the source.

@openjdk
Copy link

@openjdk openjdk bot commented Aug 28, 2020

@rwestberg this pull request can not be integrated into master 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 mlrules_update
git fetch https://git.openjdk.java.net/skara master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

# Conflicts:
#	config/mailinglist/rules/jdk.json
@openjdk openjdk bot removed the merge-conflict label Aug 28, 2020
edvbld
edvbld approved these changes Aug 28, 2020
Copy link
Member

@edvbld edvbld left a comment

Great improvements!

@openjdk
Copy link

@openjdk openjdk bot commented Aug 28, 2020

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

mlrules: applying off-list suggestions

Reviewed-by: ehelin
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

There are currently no new commits on the master branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate 92a97993eaccff9b49a06b282e8ae16f4dc4befb.

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

@openjdk openjdk bot added the ready label Aug 28, 2020
@edvbld
Copy link
Member

@edvbld edvbld commented Aug 28, 2020

One more addition: I would probably have coalesced hotspot-gc-dev, hotspot-runtime-dev and hotspot-gc-dev into hotspot-dev.

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Aug 28, 2020

/integrate

@openjdk openjdk bot closed this Aug 28, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 28, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Aug 28, 2020

@rwestberg
Pushed as commit e3aa0f1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants