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

8301269: Update Commons BCEL to Version 6.7.0 #12464

Closed
wants to merge 2 commits into from

Conversation

JoeWang-Java
Copy link
Member

@JoeWang-Java JoeWang-Java commented Feb 8, 2023

Update Commons BCEL in the JDK from 6.5.0 to 6.7.0.

  1. Improvement
    Code modernization (using relatively more modern language features), normalization (such as naming), javadocs, cleanup and minor improvements made up most of the changes. These changes do not change how BCEL works for the XSLT function in the JDK. Many of the changes unfortunately created long lines, for example merging multiple lines into a single long line, not what we would like to have in the JDK, but I have to leave them as they are so that they don't show up as changes in future updates.

  2. Exclusions
    As it has always been, the focus of the BCEL component is to satisfy the needs for the XSLT functionality. Classes not needed for the JDK are excluded as it has been done previously, this is especially true in the util package. The verifier package is also excluded. Methods and sources that have dependencies on the excluded classes are either removed or modified.

  3. Deprecation and Warnings

    Deprecated classes and contents relying on them are removed or modified to use proper methods without changing the functionality. Deprecated fields in the original source were changed to private ones in previous update in the JDK, however, since the update process applies sources from the upstream again, they were reverted back. In order to not have to go through them on every update, I'll keep the original source this time.

    Warnings were one of the main reasons for the changes made to the original source. It has been done in the previous update. In this update, many of the previous JDK fixes on warnings have already been addressed in the upstream source as the result of item 1, thus lessoned the needs to reapply the warning patches. Fixed the rest of warnings as they showed up during build.

  4. Note that JRocket specific patches are not in the current code base.

  5. Test
    Tier2 tests passed.
    JCK XML tests passed.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12464

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12464.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 8, 2023

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 8, 2023
@openjdk
Copy link

openjdk bot commented Feb 8, 2023

@JoeWang-Java The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Feb 8, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 8, 2023

Webrevs

Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Choose a reason for hiding this comment

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

Hi Joe,

This looks good to me based on my pass through

@openjdk
Copy link

openjdk bot commented Feb 9, 2023

@JoeWang-Java 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:

8301269: Update Commons BCEL to Version 6.7.0

Reviewed-by: lancea

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 56 new commits pushed to the master branch:

  • 84e4799: 8297292: java/nio/channels/FileChannel/FileExtensionAndMap.java is too slow
  • 57798dd: 6595142: (spec) ByteArrayInputStream treats bytes, not characters
  • 880f52f: 8301638: A number of nsk/jdi invokemethod tests should be converted to create virtual threads
  • db1b48e: 8302167: Avoid allocating register in fast_lock()
  • 582b943: 8278965: crash in SymbolTable::do_lookup
  • 4539899: 8301480: Replace NULL with nullptr in os/posix
  • 1428db7: 8301224: Replace NULL with nullptr in share/gc/shared/
  • c25b4f4: 8301578: Perform output outside synchronization in Module.class
  • 5830c03: 8302004: InlineTree should consult replay file in release build
  • c8ace48: 8301072: Replace NULL with nullptr in share/oops/
  • ... and 46 more: https://git.openjdk.org/jdk/compare/2a579ab8392d30a35f044954178c788d16d4b800...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ 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 Pull request is ready to be integrated label Feb 9, 2023
@JoeWang-Java
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 11, 2023

Going to push as commit 6a44120.
Since your change was applied there have been 61 commits pushed to the master branch:

  • 6f9f2b5: 8301737: java/rmi/server/UnicastRemoteObject/serialFilter/FilterUROTest.java fail with -Xcomp
  • 1ef9f65: 8302172: [JVMCI] HotSpotResolvedJavaMethodImpl.canBeInlined must respect ForceInline
  • 74b167b: 8301819: Enable continuations code by default
  • 919a6da: 8301202: Port fdlibm log to Java
  • 98e98e9: 8296322: javac: use methods to manage parser mode flags
  • 84e4799: 8297292: java/nio/channels/FileChannel/FileExtensionAndMap.java is too slow
  • 57798dd: 6595142: (spec) ByteArrayInputStream treats bytes, not characters
  • 880f52f: 8301638: A number of nsk/jdi invokemethod tests should be converted to create virtual threads
  • db1b48e: 8302167: Avoid allocating register in fast_lock()
  • 582b943: 8278965: crash in SymbolTable::do_lookup
  • ... and 51 more: https://git.openjdk.org/jdk/compare/2a579ab8392d30a35f044954178c788d16d4b800...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 11, 2023
@openjdk openjdk bot closed this Feb 11, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 11, 2023
@openjdk
Copy link

openjdk bot commented Feb 11, 2023

@JoeWang-Java Pushed as commit 6a44120.

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

@JoeWang-Java JoeWang-Java deleted the JDK-8301269 branch March 6, 2023 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants