8275233: Incorrect line number reported in exception stack trace thrown from a lambda expression

[cushon]

This change fixes a bug introduced in JDK-8200301, which tries to check if line or variable debug info is generated, but fails to consider that line debug info is generated if no -g or -g: options are passed.

The new check is consistent with the handling of lines in e.g.

• jdk/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java

  Lines 421 to 422 in 17ceef9

  	lineDebugInfo = options.isUnset(G_CUSTOM) ||
  	options.isSet(G_CUSTOM, "lines");

• jdk/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java

  Lines 118 to 120 in fe89dd3

  	lineDebugInfo =
  	options.isUnset(G_CUSTOM) ||
  	options.isSet(G_CUSTOM, "lines");

---

Progress

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

Issue

• JDK-8275233: Incorrect line number reported in exception stack trace thrown from a lambda expression

Reviewers

• Jan Lahoda (@lahodaj - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6733/head:pull/6733
$ git checkout pull/6733

Update a local copy of the PR:
$ git checkout pull/6733
$ git pull https://git.openjdk.java.net/jdk pull/6733/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6733

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6733.diff

[bridgekeeper]

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

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

[mlbridge]

Webrevs

• 01: Full - Incremental (2f303f21)
• 00: Full (b83231cc)

[lahodaj]

Looks reasonable to me.

[openjdk]

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

8275233: Incorrect line number reported in exception stack trace thrown from a lambda expression

Reviewed-by: jlahoda

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

• 3955b03: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
• 5a036ac: 8277990: NMT: Remove NMT shutdown capability
• 7217cb7: 8274883: (se) Selector.open throws IAE when the default file system provider is changed to a custom provider
• 7ea4b19: 8278166: java/nio/channels/Channels/TransferTo.java timed out
• 543d1a8: 8275721: Name of UTC timezone in a locale changes depending on previous code
• bd7c54a: 8278341: Liveness check for global scope is not as fast as it could be
• c609b5d: 8277628: Spec for InetAddressResolverProvider::get() throwing error or exception could be clearer
• bb50b92: 8277536: Use String.blank in jdk.javadoc where applicable
• 5b81d5e: 8276901: Implement UseHeavyMonitors consistently
• 69d8669: 8278339: ServerSocket::isClosed may return false after accept throws
• ... and 8 more: https://git.openjdk.java.net/jdk/compare/10db0e41634b62be5c1a931bd54ac4260108670d...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.

[cushon]

/integrate

[openjdk]

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

• 3955b03: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
• 5a036ac: 8277990: NMT: Remove NMT shutdown capability
• 7217cb7: 8274883: (se) Selector.open throws IAE when the default file system provider is changed to a custom provider
• 7ea4b19: 8278166: java/nio/channels/Channels/TransferTo.java timed out
• 543d1a8: 8275721: Name of UTC timezone in a locale changes depending on previous code
• bd7c54a: 8278341: Liveness check for global scope is not as fast as it could be
• c609b5d: 8277628: Spec for InetAddressResolverProvider::get() throwing error or exception could be clearer
• bb50b92: 8277536: Use String.blank in jdk.javadoc where applicable
• 5b81d5e: 8276901: Implement UseHeavyMonitors consistently
• 69d8669: 8278339: ServerSocket::isClosed may return false after accept throws
• ... and 8 more: https://git.openjdk.java.net/jdk/compare/10db0e41634b62be5c1a931bd54ac4260108670d...master

Your commit was automatically rebased without conflicts.

[openjdk]

@cushon Pushed as commit d7c283a.

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