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

8296846: Minor cleanup of some dead code in Flow.java #11112

Closed
wants to merge 1 commit into from

Conversation

archiecobbs
Copy link
Contributor

@archiecobbs archiecobbs commented Nov 11, 2022

This patch removes two bits of dead code that I ran across.

The only interesting bit is the second patch, which removes this check:

                /*  Ignore synthetic methods, except for translated lambda methods.
                 */
                if ((tree.sym.flags() & (SYNTHETIC | LAMBDA_METHOD)) == SYNTHETIC) {
                    return;
                }

because it's always preceded by this more general check:

             /*  MemberEnter can generate synthetic methods ignore them
              */
             if ((tree.sym.flags() & SYNTHETIC) != 0) {
                 return;
             }

and so can never match.

So the patch preserves the existing behavior, but the bit being removed there begs the question: was there some scenario where tree.sym.flags() could have both SYNTHETIC and LAMBDA_METHOD that we were supposed to be handling?

As it turns out, the LAMBDA_METHOD flag is only ever set by LambdaToMethod, but that class runs after this code (during flow analysis). So if there ever was any such scenario, it can no longer happen anyway.


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

  • JDK-8296846: Minor cleanup of some dead code in Flow.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11112

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 11, 2022

👋 Welcome back archiecobbs! 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 Nov 11, 2022
@openjdk
Copy link

openjdk bot commented Nov 11, 2022

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

  • 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 compiler compiler-dev@openjdk.org label Nov 11, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 11, 2022

Webrevs

Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle left a comment

Choose a reason for hiding this comment

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

lgtm

@openjdk
Copy link

openjdk bot commented Nov 16, 2022

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

8296846: Minor cleanup of some dead code in Flow.java

Reviewed-by: vromero

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

  • b3ef337: 8296960: [JVMCI] list HotSpotConstantPool.loadReferencedType to ConstantPool
  • f0474b8: 8283238: make/scripts/compare.sh should show the diff when classlist does not match
  • 04a4d34: 8297006: JFR: AbstractEventStream should not hold thread instance
  • 5db1b58: 8296961: [JVMCI] Access to j.l.r.Method/Constructor/Field for ResolvedJavaMethod/ResolvedJavaField
  • 4ce4f38: 8296958: [JVMCI] add API for retrieving ConstantValue attributes
  • 8c26d02: 8295315: [REDO] 8276687 Remove support for JDK 1.4.1 PerfData shared memory files
  • 8752bb4: 8296818: Enhance JMH tests java/security/Signatures.java
  • b97fc93: 7132279: (ch) SeekableByteChannel operation may throw Non{Readable,Writable}ChannelException
  • 39dda24: 8157173: [macosx] java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java fails
  • 51f690d: 8297134: Add a @sealedGraph tag to InetAddress
  • ... and 62 more: https://git.openjdk.org/jdk/compare/819c6919ca3067ec475b5b268f54e10700eec039...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@vicente-romero-oracle) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 16, 2022
@archiecobbs
Copy link
Contributor Author

Thanks for the review.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 16, 2022
@openjdk
Copy link

openjdk bot commented Nov 16, 2022

@archiecobbs
Your change (at version 3c194df) is now ready to be sponsored by a Committer.

@TheShermanTanker
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 17, 2022

@TheShermanTanker Only Committers are allowed to sponsor changes.

@TheShermanTanker
Copy link
Contributor

Guess my committer status promotion hasn't been fully registered with the integration system yet, sorry @archiecobbs

@vicente-romero-oracle
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 18, 2022

Going to push as commit 2f063b8.
Since your change was applied there have been 109 commits pushed to the master branch:

  • ab6b7ef: 8296901: Do not create unsigned certificate and CRL
  • 7b3984c: 8296463: Memory leak in JVM_StartThread with the integration of Virtual threads
  • 373e52c: 8296785: Use realloc for CHeap-allocated BitMaps
  • a53be20: 8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
  • 66228f7: 8297074: Use enhanced-for cycle instead of Enumeration in javax.crypto
  • 819af69: 8249693: java/nio/channels/FileChannel/FileExtensionAndMap.java uses @ignore w/o bug id
  • 9c432a0: 8297165: Update Pandoc to version 2.19.2 for Oracle builds
  • 8b140e2: 8297152: Add a @sealedGraph tag to ZoneId
  • 992f209: 8287180: Update IANA Language Subtag Registry to Version 2022-08-08
  • a768fed: 8297184: Test runtime/ErrorHandling/TestSigInfoInHsErrFile.java is failing
  • ... and 99 more: https://git.openjdk.org/jdk/compare/819c6919ca3067ec475b5b268f54e10700eec039...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 18, 2022
@openjdk openjdk bot closed this Nov 18, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Nov 18, 2022
@openjdk
Copy link

openjdk bot commented Nov 18, 2022

@vicente-romero-oracle @archiecobbs Pushed as commit 2f063b8.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants