8260338: Some fields in HaltNode is not cloned #2213

YaSuenag · 2021-01-25T01:53:56Z

I got strange log as following. Contents in CodeString is garbled. It seems not to be initialized.

[3.155s][trace][codestrings ] Created CodeString [ dｴ・] (0x7f3804a150)

HaltNode has two fields - _reachable and _halt_reason, but they would not be cloned at Node::clone.

Progress

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

Issue

JDK-8260338: Some fields in HaltNode is not cloned

Reviewers

Xin Liu (@navyxliu - no project role)
Nils Eliasson (@neliasso - Reviewer)
Tobias Hartmann (@TobiHartmann - Reviewer)

Download

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

bridgekeeper · 2021-01-25T01:54:08Z

👋 Welcome back ysuenaga! 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 · 2021-01-25T01:55:04Z

@YaSuenag 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 · 2021-01-25T04:30:45Z

Webrevs

01: Full - Incremental (88e6327)
00: Full (6fa9730)

navyxliu · 2021-01-25T06:22:49Z

src/hotspot/share/opto/node.cpp

  if (n->is_SafePoint()) {
    n->as_SafePoint()->clone_replaced_nodes();
  }
+  if (n->is_Halt()) {


This line seems unnecessary. I see HaltNode::size() increases from 0x60 to 0x70 with your patch. Memcpy at line 502 covers it, doesn't it?

_reachable and _halt_reason are available on HaltNode, not Node, so I think this condition is necessary.
L502 uses the result of Node::size_of(), and I overrided it in HaltNode. So memory allocation at L501 and memcpy at L502 are safety.

size_of() is a virtual function. line 500 should use HaltNode::size_of(), which give you 112(0x70) bytes, right?
I mean memcpy at line 502 should cover HaltNode's member variables.
Copy::conjoint_words_to_lower((HeapWord*)this, (HeapWord*)n, s);

Ah, you are right, thanks!
I reverted the change for node.cpp.

navyxliu

LGTM, but still need a reviewer's approval.

neliasso

Looks good.

openjdk · 2021-01-25T08:28:15Z

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

8260338: Some fields in HaltNode is not cloned

Reviewed-by: xliu, neliasso, 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 6 new commits pushed to the master branch:

af155fc: 8258836: JNI local refs exceed capacity getDiagnosticCommandInfo
d825339: 8260263: Remove PtrQueue::_qset
5898ab6: 8259894: refactor parts of jvm.h into jvm_io.h and jvm_constants.h
764111f: 8260272: bash configure --prefix does not work after JDK-8257679
4ae39b1: 8260208: Improve dummy object filling condition in G1CollectedHeap::fill_archive_regions in cds
c52c6c6: 8260273: DataOutputStream writeChars optimization

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.

YaSuenag · 2021-01-25T09:12:13Z

/integrate

openjdk · 2021-01-25T09:13:15Z

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

af155fc: 8258836: JNI local refs exceed capacity getDiagnosticCommandInfo
d825339: 8260263: Remove PtrQueue::_qset
5898ab6: 8259894: refactor parts of jvm.h into jvm_io.h and jvm_constants.h
764111f: 8260272: bash configure --prefix does not work after JDK-8257679
4ae39b1: 8260208: Improve dummy object filling condition in G1CollectedHeap::fill_archive_regions in cds
c52c6c6: 8260273: DataOutputStream writeChars optimization

Your commit was automatically rebased without conflicts.

Pushed as commit 09489e2.

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

TobiHartmann · 2021-01-25T09:20:36Z

@YaSuenag For future PRs, please wait for at least 24 hours before integrating a non-trivial change. A change is only considered trivial if it's explicitly stated by a reviewer in the PR (see trivial in OpenJDK Developers’ Guide. Thanks.

YaSuenag · 2021-01-25T09:24:43Z

@YaSuenag For future PRs, please wait for at least 24 hours before integrating a non-trivial change. A change is only considered trivial if it's explicitly stated by a reviewer in the PR (see trivial in OpenJDK Developers’ Guide. Thanks.

Sorry, I got it.

8260338: Some fields in HaltNode is not cloned

6fa9730

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jan 25, 2021

YaSuenag marked this pull request as ready for review January 25, 2021 04:27

openjdk bot added the rfr Pull request is ready for review label Jan 25, 2021

navyxliu reviewed Jan 25, 2021

View reviewed changes

Revert change for node.cpp

88e6327

navyxliu approved these changes Jan 25, 2021

View reviewed changes

neliasso approved these changes Jan 25, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 25, 2021

TobiHartmann approved these changes Jan 25, 2021

View reviewed changes

openjdk bot closed this Jan 25, 2021

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 Jan 25, 2021

YaSuenag deleted the JDK-8260338 branch January 25, 2021 09:35

8260338: Some fields in HaltNode is not cloned #2213

8260338: Some fields in HaltNode is not cloned #2213

Conversation

YaSuenag commented Jan 25, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Download

Uh oh!

bridgekeeper bot commented Jan 25, 2021

Uh oh!

openjdk bot commented Jan 25, 2021

Uh oh!

mlbridge bot commented Jan 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

navyxliu Jan 25, 2021

Choose a reason for hiding this comment

Uh oh!

YaSuenag Jan 25, 2021

Choose a reason for hiding this comment

Uh oh!

navyxliu Jan 25, 2021

Choose a reason for hiding this comment

Uh oh!

YaSuenag Jan 25, 2021

Choose a reason for hiding this comment

Uh oh!

navyxliu left a comment

Choose a reason for hiding this comment

Uh oh!

neliasso left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Jan 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

YaSuenag commented Jan 25, 2021

Uh oh!

openjdk bot commented Jan 25, 2021

Uh oh!

TobiHartmann commented Jan 25, 2021

Uh oh!

YaSuenag commented Jan 25, 2021

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

YaSuenag commented Jan 25, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 25, 2021 •

edited

Loading

openjdk bot commented Jan 25, 2021 •

edited

Loading