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

8252916: Newline in object field values list of ScopeDesc should be removed #75

Closed
wants to merge 1 commit into from

Conversation

@TobiHartmann
Copy link
Member

@TobiHartmann TobiHartmann commented Sep 8, 2020

Given the following test:

public class Test {

    static class MyClass {
        Object o1 = null;
        Object o2 = new Integer(42);
    }

    static Object test(boolean trap) {
        MyClass obj = new MyClass();
        if (trap) { }
        return obj.o1;
    }

    public static void main(String[] args) {
        for (int i = 0; i < 100_000; ++i) {
            test(false);
        }
    }
}

The ScopeDesc for the uncommon trap in C2 compiled 'test' is printed like this:

ScopeDesc(pc=0x00007f52a5160144 offset=84):
   Test::test@9 (line 11) reexecute=true
   Locals
    - l0: empty
    - l1: obj[52]
   Expression stack
    - @0: reg rbp [10],int
   Objects
    - 52: Test$MyClass NULL
, stack[0],oop

There should be no newline after "NULL".

This is a regression from JDK-8202171 in JDK 12. The fix is to no print a new line in to be consistent with 'print_value_on'.

Thanks,
Tobias


Progress

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

Issue

  • JDK-8252916: Newline in object field values list of ScopeDesc should be removed

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 8, 2020

👋 Welcome back thartmann! 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 openjdk bot commented Sep 8, 2020

@TobiHartmann 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 (add|remove) "label" command.

@openjdk openjdk bot added the hotspot-compiler label Sep 8, 2020
@TobiHartmann TobiHartmann marked this pull request as ready for review Sep 8, 2020
@openjdk openjdk bot added the rfr label Sep 8, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 8, 2020

Webrevs

@iwanowww
Copy link

@iwanowww iwanowww commented Sep 8, 2020

Looks good and trivial.

@iwanowww
Copy link

@iwanowww iwanowww commented Sep 8, 2020

/reviewer add vlivanov

@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2020

@iwanowww Only the author (@TobiHartmann) is allowed to issue the reviewer command.

@TobiHartmann
Copy link
Member Author

@TobiHartmann TobiHartmann commented Sep 8, 2020

Thanks Vladimir!

@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2020

@TobiHartmann This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8252916: Newline in object field values list of ScopeDesc should be removed

Reviewed-by: vlivanov
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 10 commits pushed to the master branch:

  • 30fa8d5: 8157729: examples in LinkedHashMap and LinkedHashSet class doc use raw types
  • 26c7218: 8252773: [TESTBUG] serviceability/jvmti/GetObjectSizeOverflow fails due to OOM conditions
  • e20004d: 8249625: cleanup unused SkippedException in the tests under cds/appcds/dynamicArchive/methodHandles
  • 63a5a12: 8252658: G1: Do not consider G1HeapWastePercent during region selection within a gc
  • 001e51d: 8250563: Add KVHashtable::add_if_absent
  • 91a20ca: 8252695: Shenandoah: clean up Graal enabled/disabled filter in tests
  • 704f784: 8252871: fatal error: must own lock JvmtiThreadState_lock
  • bf5da0c: 8252897: Minor .jcheck/conf update
  • 7600274: 8252859: Inconsistent use of alpha in class AbsSeq
  • 4fb1980: 8252853: AArch64: gc/shenandoah/TestVerifyJCStress.java fails intermittently with C1

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 30fa8d5d341fbf64e84da13a05c8048afba25196.

➡️ 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 Sep 8, 2020
@TobiHartmann
Copy link
Member Author

@TobiHartmann TobiHartmann commented Sep 9, 2020

/integrate

@openjdk openjdk bot closed this Sep 9, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 9, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 9, 2020

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

  • 30fa8d5: 8157729: examples in LinkedHashMap and LinkedHashSet class doc use raw types
  • 26c7218: 8252773: [TESTBUG] serviceability/jvmti/GetObjectSizeOverflow fails due to OOM conditions
  • e20004d: 8249625: cleanup unused SkippedException in the tests under cds/appcds/dynamicArchive/methodHandles
  • 63a5a12: 8252658: G1: Do not consider G1HeapWastePercent during region selection within a gc
  • 001e51d: 8250563: Add KVHashtable::add_if_absent
  • 91a20ca: 8252695: Shenandoah: clean up Graal enabled/disabled filter in tests
  • 704f784: 8252871: fatal error: must own lock JvmtiThreadState_lock
  • bf5da0c: 8252897: Minor .jcheck/conf update
  • 7600274: 8252859: Inconsistent use of alpha in class AbsSeq
  • 4fb1980: 8252853: AArch64: gc/shenandoah/TestVerifyJCStress.java fails intermittently with C1

Your commit was automatically rebased without conflicts.

Pushed as commit c655b70.

💡 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants