Skip to content

Conversation

@cl4es
Copy link
Member

@cl4es cl4es commented Nov 17, 2020

This moves the mirroring of vmSymbols in ciSymbols to a separate file, ciSymbols.hpp, to reduce includes throughout hotspot (and clean up the ciSymbol namespace). In a few places code is moved from .hpp to .cpp to facilitate this.

With PCH disabled, this reduces total includes from 276949 to 276332


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8256424: Move ciSymbol::symbol_name() to ciSymbols::symbol_name()

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1256/head:pull/1256
$ git checkout pull/1256

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 17, 2020

👋 Welcome back redestad! 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
Copy link

openjdk bot commented Nov 17, 2020

@cl4es The following label will be automatically applied to this pull request:

  • hotspot-compiler

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 hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 17, 2020
@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org and removed hotspot-compiler hotspot-compiler-dev@openjdk.org labels Nov 18, 2020
@openjdk
Copy link

openjdk bot commented Dec 4, 2020

⚠️ @cl4es This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@cl4es cl4es marked this pull request as ready for review December 5, 2020 13:14
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 5, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 5, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 7, 2020

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

8256424: Move ciSymbol::symbol_name() to ciSymbols::symbol_name()

Reviewed-by: kvn, iklam

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

  • 044616b: 8252049: Native memory leak in ciMethodData ctor
  • fab6158: 8236413: AbstractConnectTimeout should tolerate both NoRouteToHostException and UnresolvedAddressException
  • 936a7ac: 8252797: Non-PCH build fails on Ubuntu 16.4 when building with gtests

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Dec 7, 2020
vmIntrinsics::ID known_intrinsic();
void compute_escape_for_intrinsic(vmIntrinsics::ID iid);
vmIntrinsicID known_intrinsic();
void compute_escape_for_intrinsic(vmIntrinsicID iid);
Copy link
Member

Choose a reason for hiding this comment

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

I think the use of vmIntrinsics::ID in bcEscapeAnalyzer.cpp should also be changed to vmIntrinsicID for consistency, even though they are the same type. (The same for other hpp files such as ciMethod.hpp)


#include "precompiled.hpp"
#include "asm/macroAssembler.hpp"
#include "ci/ciSymbols.hpp"
Copy link
Member

Choose a reason for hiding this comment

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

This file doesn't seem to use the exports from ciSymbols.hpp.

@cl4es
Copy link
Member Author

cl4es commented Dec 10, 2020

/integrate

@openjdk openjdk bot closed this Dec 10, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 10, 2020
@openjdk
Copy link

openjdk bot commented Dec 10, 2020

@cl4es Since your change was applied there have been 59 commits pushed to the master branch:

  • 1e5e790: 8258018: Remove arrayOop.inline.hpp
  • 6693611: 8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems
  • 6be1f56: 8257450: Start of release updates for JDK 17
  • d163c6f: 8258015: [JVMCI] JVMCI_lock shouldn't be held while initializing box classes
  • b35401d: 8257966: Instrument test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java
  • 37043b0: 8257837: Performance regression in heap byte buffer views
  • 0890620: 8258005: JDK build fails with incorrect fixpath script
  • 502a524: 8257602: Introduce JFR Event Throttling and new jdk.ObjectAllocationSample event (enabled by default)
  • 026b09c: 8257483: C2: Split immediate vector rotate from RotateLeftV and RotateRightV nodes
  • 0a0691e: 8257901: ZGC: Take virtual memory usage into account when sizing heap
  • ... and 49 more: https://git.openjdk.java.net/jdk/compare/d0c526513d7d82c2a4bb9ef72656cc35de8452e9...master

Your commit was automatically rebased without conflicts.

Pushed as commit f574056.

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

@cl4es cl4es deleted the ciSymbols branch December 10, 2020 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

3 participants