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

8259576: Misplaced curly brace in Matcher::find_shared_post_visit #2031

Closed

Conversation

@shipilev
Copy link
Contributor

@shipilev shipilev commented Jan 11, 2021

SonarCloud demo instance reports the issue here:

    case Op_VectorMaskCmp: {
      n->set_req(1, new BinaryNode(n->in(1), n->in(2)));
      n->set_req(2, n->in(3));
      n->del_req(3);
      break;
    default: // <----- ERROR
      break;
    }

"The direct parent of this switch-label is not the body of a switch statement."

This is added by JDK-8223347, and it is an obviously misplaced curly-brace. It is innocuous in current code, but may become problematic as more cases are added to the switch.


Progress

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

Issue

  • JDK-8259576: Misplaced curly brace in Matcher::find_shared_post_visit

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 11, 2021

👋 Welcome back shade! 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 label Jan 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 11, 2021

@shipilev 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 11, 2021

Webrevs

Copy link
Contributor

@RealLucy RealLucy left a comment

This fix looks good (and trivial) to me.

I personally would open a separate context for a case body only if there is an actual need (decl of locals, e.g.). But that's just my taste. Not relevant at all.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 11, 2021

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

8259576: Misplaced curly brace in Matcher::find_shared_post_visit

Reviewed-by: lucy, thartmann

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

  • 77f6290: 8258254: Move PtrQueue flush to PtrQueueSet subclasses
  • 2255ab7: 8258810: Improve enum traits
  • ae0532e: 8259044: JVM lacks data type qualifier when using -XX:+PrintAssembly with AArch64-Neon backend
  • b378f54: Merge
  • 2cb271e: 8253996: Javac error on jdk16 build 18: invalid flag: -Xdoclint:-missing
  • d60a937: 8259028: ClassCastException when using custom filesystem with wrapper FileChannel impl
  • e05f36f: 8259043: More Zero architectures need linkage with libatomic
  • 020ec84: 8259429: Update reference to README.md
  • fb68395: 8259014: (so) ServerSocketChannel.bind(UnixDomainSocketAddress)/SocketChannel.bind(UnixDomainSocketAddress) will have unknown user and group owner (win)
  • b6d51e1: 8259585: Accessible actions do not work on mac os x
  • ... and 16 more: https://git.openjdk.java.net/jdk/compare/18a37f9453cd1a5740da47b93ce6122052ccd43b...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 label Jan 11, 2021
Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jan 12, 2021

Thanks!

/integrate

@openjdk openjdk bot closed this Jan 12, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jan 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 12, 2021

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

  • a6ab9e4: 8258576: Try to get zerobased CCS if heap is above 32 and CDS is disabled
  • a3561ae: 8258243: C2: assert failed ("Bad derived pointer") with -XX:+VerifyRegisterAllocator
  • 4663704: 8259583: Remove unused decode_env::_codeBuffer
  • 9d4e84f: 8259565: Zero: compiler/runtime/criticalnatives fails because CriticalJNINatives is not supported
  • 98ccfbf: 8255710: Opensource unit/regression tests for CMM
  • 61c5b95: 7194219: java/awt/Component/UpdatingBootTime/UpdatingBootTime.html fails on Linux
  • 77f6290: 8258254: Move PtrQueue flush to PtrQueueSet subclasses
  • 2255ab7: 8258810: Improve enum traits
  • ae0532e: 8259044: JVM lacks data type qualifier when using -XX:+PrintAssembly with AArch64-Neon backend
  • b378f54: Merge
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/18a37f9453cd1a5740da47b93ce6122052ccd43b...master

Your commit was automatically rebased without conflicts.

Pushed as commit 4697cfa.

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

@shipilev shipilev deleted the JDK-8259576-misplaced-curly branch Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants