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

8255208: CodeStrings passed to Disassembler::decode are ignored #788

Closed
wants to merge 21 commits into from

Conversation

cl4es
Copy link
Member

@cl4es cl4es commented Oct 21, 2020

CodeStrings passed directly to Disassembler::decode are wrongly ignored.

This patch started out as a cleanup to clean out CodeStrings, but I realized as I was about to remove the suspiciously unused CodeStrings in the disassembler that them being unused was likely a bug.

For example, -XX:+PrintInterpreter (on debug builds) included messages which can help digesting the output (if not else by emitting text hooks to the place in the source code where the asm is generated):

  0x00007f1f7093becb: je 0x00007f1f7093bee5
 ;; call_VM_base: heap base corrupted?                                <<< omitted
  0x00007f1f7093bed1: mov $0x7f1f90c7ecb8,%rdi
  0x00007f1f7093bedb: and $0xfffffffffffffff0,%rsp
  0x00007f1f7093bedf: callq 0x00007f1f9046c0a0 = MacroAssembler::debug64(char*, long, long*) 

While PrintInterpreter is the only case that appears directly affected, restoring this capability seems useful in general.

The cleaning up of the code also has some nice side-effects such as reducing the size of a CodeBuffer from 432 to 408 bytes and marginally improving the static size of the JVM (as measured on linux-x64)


Progress

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

Testing

Linux x32 Linux x64 Windows x64 macOS x64
Build ✔️ (1/1 passed) ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) (1/9 failed) ✔️ (9/9 passed)

Failed test task

Issue

  • JDK-8255208: CodeStrings passed to Disassembler::decode are ignored

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 21, 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 Oct 21, 2020

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

  • hotspot

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 hotspot-dev@openjdk.org label Oct 21, 2020
@cl4es cl4es marked this pull request as ready for review Oct 22, 2020
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 22, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 22, 2020

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

very nice clean up

@openjdk
Copy link

openjdk bot commented Oct 22, 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:

8255208: CodeStrings passed to Disassembler::decode are ignored

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

  • 0aa3c92: 8255262: Remove use of legacy custom @SPEC tag
  • a0b687b: 8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations
  • f279ddf: 8248411: [aarch64] Insufficient error handling when CodeBuffer is exhausted
  • 4634dbe: 8223312: Utilize handshakes instead of is_thread_fully_suspended
  • cc50c8d: 8255196: Remove unused G1FullGCCompactionPoint::merge()
  • ae72b52: 8255047: Add HotSpot UseDebuggerErgo flags
  • 211bb62: 8255124: KeepAliveStreamCleaner may crash with java.lang.IllegalMonitorStateException: current thread is not owner
  • 299e115: 8198395: Test javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java fails in mach5
  • a5b7bc5: 7156347: javax/swing/JList/6462008/bug6462008.java fails
  • b25d894: 8252204: AArch64: Implement SHA3 accelerator/intrinsic
  • ... and 3 more: https://git.openjdk.java.net/jdk/compare/1191a633fe3aab6d04be074d4cb6e23bffcc373b...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 Oct 22, 2020
@cl4es
Copy link
Member Author

cl4es commented Oct 22, 2020

very nice clean up

Thanks!

iklam
iklam approved these changes Oct 22, 2020
Copy link
Member

@iklam iklam left a comment

LGTM

@cl4es
Copy link
Member Author

cl4es commented Oct 23, 2020

@vnkozlov @iklam - thank you for reviewing!

/integrate

@openjdk openjdk bot closed this Oct 23, 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 Oct 23, 2020
@openjdk
Copy link

openjdk bot commented Oct 23, 2020

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

  • 8e5dff0: 8255213: Shenandoah build fails without JFR after JDK-8255036
  • fe74f3c: 8255224: x86_32 tests fail with "bad AD file" after JDK-8223051
  • 64dc4b1: 8255225: compiler/aot tests fail on Windows with NPE during artifact resolution
  • a824781: 8255210: [Vector API] jdk/incubator/vector/Int256VectorTests.java crashes on AVX512 machines
  • 2ca7a08: 8255268: 32-bit failures in runtime/Metaspace/elastic
  • d8d9197: 8242559: Clean the "libawt_xawt" library from code for headless mode
  • ff5f226: 8255086: Update the root locale display names
  • 8afdcae: 8255031: Update java/util/prefs/AddNodeChangeListener.java to report more failure info
  • 0aa3c92: 8255262: Remove use of legacy custom @SPEC tag
  • a0b687b: 8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/1191a633fe3aab6d04be074d4cb6e23bffcc373b...master

Your commit was automatically rebased without conflicts.

Pushed as commit c1524c5.

💡 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
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
3 participants