JDK-8305644: IGV: Node text not updated when switching from/to CFG view

[tobiasholenstein]

When switching the layouting mode to or from CFG the node text is not updated.

• Switching to CFG view gave the wrong node text:

- with this fix it looks like this

• Switching from CFG view gave the wrong node text:

- with this fix it looks like this

---

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-8305644: IGV: Node text not updated when switching from/to CFG view

Reviewers

• Roberto Castañeda Lozano (@robcasloz - Reviewer)
• Christian Hagedorn (@chhagedorn - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13348

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back tholenstein! 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]

@tobiasholenstein 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]

Webrevs

• 01: Full - Incremental (8b69ac9b)
• 00: Full (06756d71)

[robcasloz]

Looks good, thanks for fixing this! I must have missed testing this scenario when merging the changes from JDK-8302644 into JDK-8302738.

[openjdk]

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

8305644: IGV: Node text not updated when switching from/to CFG view

Reviewed-by: rcastanedalo, chagedorn

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

• 4bf1987: 8296454: System.console() shouldn't return null in jshell
• 2aec910: 8304883: Record Deconstruction causes bytecode error
• 0e0c022: 8305356: Fix ignored bad CompileCommands in tests
• b659c35: 8068824: Exception thrown in JTableHeader after clicking on popupmenu opened with right-click on header
• 83a924a: 8304042: C2 SuperWord: schedule must remove packs with cyclic dependencies
• 0ec3d2e: 7124527: [macosx] SwingSet2, label is not read by VoiceOver when focus is on textfield for Internalframe and Table demo.
• ed9592c: 8305113: (tz) Update Timezone Data to 2023c
• 15fa78e: 8305237: CompilerDirectives DCmds permissions correction
• 7cf24d1: 8305400: ISO 4217 Amendment 175 Update
• a324fa2: 8225641: Calendar.roll(int field) does not work correctly for WEEK_OF_YEAR
• ... and 56 more: https://git.openjdk.org/jdk/compare/049b953f8fdab62532e957c86a6009f4c8fa1653...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.

[chhagedorn]

Given that this line was dropped by mistake, the fix to add the line again looks good and trivial. Nevertheless, setting a field in a getter method like that seems wrong/unexpected.

[tobiasholenstein]

Given that this line was dropped by mistake, the fix to add the line again looks good and trivial. Nevertheless, setting a field in a getter method like that seems wrong/unexpected.

You are right. Even though re-adding the dropped line fixes the issue, it is still bad practice. I fixed the issue now in the proper way:
showCFG is set in setShowCFG(boolean enable) - there is the right place to also set diagram.setCFG(enable); and NOT in the getDiagram() since getters should be side effect free. Thanks for the input @chhagedorn !

[chhagedorn]

That looks much better! Thanks for investigating further how to properly fix this :-)

[tobiasholenstein]

Thanks @chhagedorn and @robcasloz for the reviews!

/integrate

[openjdk]

Going to push as commit 9f587d2.
Since your change was applied there have been 66 commits pushed to the master branch:

• 4bf1987: 8296454: System.console() shouldn't return null in jshell
• 2aec910: 8304883: Record Deconstruction causes bytecode error
• 0e0c022: 8305356: Fix ignored bad CompileCommands in tests
• b659c35: 8068824: Exception thrown in JTableHeader after clicking on popupmenu opened with right-click on header
• 83a924a: 8304042: C2 SuperWord: schedule must remove packs with cyclic dependencies
• 0ec3d2e: 7124527: [macosx] SwingSet2, label is not read by VoiceOver when focus is on textfield for Internalframe and Table demo.
• ed9592c: 8305113: (tz) Update Timezone Data to 2023c
• 15fa78e: 8305237: CompilerDirectives DCmds permissions correction
• 7cf24d1: 8305400: ISO 4217 Amendment 175 Update
• a324fa2: 8225641: Calendar.roll(int field) does not work correctly for WEEK_OF_YEAR
• ... and 56 more: https://git.openjdk.org/jdk/compare/049b953f8fdab62532e957c86a6009f4c8fa1653...master

Your commit was automatically rebased without conflicts.

[openjdk]

@tobiasholenstein Pushed as commit 9f587d2.

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