8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180 #578

DamonFool · 2020-10-09T14:22:06Z

The change fixes Zero and Minimal builds broken after JDK-8253180.

Two build errors were fixed:
1 ./src/hotspot/share/runtime/frame.cpp:1047:38: error: use of undeclared identifier 'DerivedPointerTable'
oops_do_internal(f, cf, map, true, DerivedPointerTable::is_active() ?

./src/hotspot/share/utilities/vmError.cpp: In static member function 'static void VMError::print_stack_trace(outputStream*, JavaThread*, char*, int, bool)':
./src/hotspot/share/utilities/vmError.cpp:214:28: error: no matching function for call to 'StackFrameStream::StackFrameStream(JavaThread*&)'
StackFrameStream sfs(jt);
^

Progress

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

Testing

	Linux x64	Windows x64	macOS x64
Build	✔️ (5/5 passed)	⏳ (1/2 running)	✔️ (2/2 passed)
Test (tier1)	⏳ (6/9 running)		⏳ (1/9 running)

Issue

JDK-8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180

Reviewers

Aleksey Shipilev (@shipilev - Reviewer)
Erik Österlund (@fisk - Reviewer)

Download

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

…interTable' after JDK-8253180

DamonFool · 2020-10-09T14:22:31Z

/issue add JDK-8254297
/test

bridgekeeper · 2020-10-09T14:22:58Z

👋 Welcome back jiefu! 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 · 2020-10-09T14:24:09Z

@DamonFool The primary solved issue for a PR is set through the PR title. Since the current title does not contain an issue reference, it will now be updated.

openjdk · 2020-10-09T14:25:15Z

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

DamonFool · 2020-10-09T14:26:45Z

/label add hotspot-runtime
/cc hotspot-runtime

openjdk · 2020-10-09T14:27:31Z

@DamonFool
The hotspot-runtime label was successfully added.

openjdk · 2020-10-09T14:28:03Z

@DamonFool The hotspot-runtime label was already applied.

mlbridge · 2020-10-09T14:30:15Z

Webrevs

00: Full (c5d1aad)

shipilev

I think this is fine. @fisk might need to ack this.

shipilev · 2020-10-09T14:47:19Z

src/hotspot/share/compiler/oopMap.cpp

  DerivedPointerTable::add(derived, base);
+#endif // COMPILER2_OR_JVMCI


This looks correct and actually reverses the JDK-8253180 change. It is correct because DerivedPointerTable is protected by the same #if:

#if COMPILER2_OR_JVMCI class DerivedPointerTable : public AllStatic { ...

shipilev · 2020-10-09T14:51:33Z

src/hotspot/share/runtime/frame.cpp

+#if COMPILER2_OR_JVMCI
  oops_do_internal(f, cf, map, true, DerivedPointerTable::is_active() ?
                                     DerivedPointerIterationMode::_with_table :
                                     DerivedPointerIterationMode::_ignore);
+#else
+  oops_do_internal(f, cf, map, true, DerivedPointerIterationMode::_ignore);
+#endif


We could have used COMPILER2_OR_JVMCI_PRESENT inline macro, but I think that would be messier.

shipilev · 2020-10-09T14:52:21Z

src/hotspot/share/utilities/vmError.cpp

@@ -211,7 +211,7 @@ void VMError::print_stack_trace(outputStream* st, JavaThread* jt,
    st->cr();

    // Print the frames
-    StackFrameStream sfs(jt);
+    StackFrameStream sfs(jt, true /* update */, true /* process_frames */);


This looks correct, also because it does the same thing as L227 below does.

openjdk · 2020-10-09T14:54:34Z

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

8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180

Reviewed-by: shade, eosterlund

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

7e80c98: 8254261: fix javadocs in jdk.test.lib.Utils
d4b5dfd: 8253857: Shenandoah: Bugs in ShenandoahEvacOOMHandler related code
e9c1905: 8253740: [PPC64] Minor interpreter cleanup

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.

fisk

Looks good. Thanks for fixing.

shipilev · 2020-10-09T15:02:19Z

Since mainline contains both #546 (merged yesterday) and #296 (merged today), most testing would now fail on builds steps. @DamonFool, please integrate as soon as possible!

DamonFool · 2020-10-09T15:16:00Z

Thanks @shipilev and @fisk for your review.
/integrate

openjdk · 2020-10-09T15:17:01Z

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

7e80c98: 8254261: fix javadocs in jdk.test.lib.Utils
d4b5dfd: 8253857: Shenandoah: Bugs in ShenandoahEvacOOMHandler related code
e9c1905: 8253740: [PPC64] Minor interpreter cleanup

Your commit was automatically rebased without conflicts.

Pushed as commit aaa0a2a.

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

Zero and Minimal VMs are broken with undeclared identifier 'DerivedPo…

Verified

This commit was signed with the committer’s verified signature.

phillebaba Philip Laine

GPG key ID: F6D0B743CA3EFF33

Verified
Learn about vigilant mode

c5d1aad

…interTable' after JDK-8253180

openjdk bot changed the title ~~Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180~~ 8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180 Oct 9, 2020

openjdk bot added the rfr label Oct 9, 2020

openjdk bot added the hotspot label Oct 9, 2020

openjdk bot added the hotspot-runtime label Oct 9, 2020

shipilev approved these changes Oct 9, 2020

View reviewed changes

openjdk bot added the ready label Oct 9, 2020

fisk approved these changes Oct 9, 2020

View reviewed changes

openjdk bot closed this Oct 9, 2020

openjdk bot added integrated and removed ready rfr labels Oct 9, 2020

DamonFool deleted the JDK-8254297 branch October 9, 2020 15:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180 #578

8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180 #578

DamonFool commented Oct 9, 2020 •

edited by openjdk bot

Loading

DamonFool commented Oct 9, 2020

bridgekeeper bot commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

DamonFool commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

mlbridge bot commented Oct 9, 2020

shipilev left a comment

shipilev Oct 9, 2020

shipilev Oct 9, 2020

shipilev Oct 9, 2020

openjdk bot commented Oct 9, 2020 •

edited

Loading

fisk left a comment

shipilev commented Oct 9, 2020

DamonFool commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

		DerivedPointerTable::add(derived, base);
		#endif // COMPILER2_OR_JVMCI

8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180 #578

8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180 #578

Conversation

DamonFool commented Oct 9, 2020 • edited by openjdk bot Loading

Progress

Testing

Issue

Reviewers

Download

DamonFool commented Oct 9, 2020

bridgekeeper bot commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

DamonFool commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

mlbridge bot commented Oct 9, 2020

Webrevs

shipilev left a comment

Choose a reason for hiding this comment

shipilev Oct 9, 2020

Choose a reason for hiding this comment

shipilev Oct 9, 2020

Choose a reason for hiding this comment

shipilev Oct 9, 2020

Choose a reason for hiding this comment

openjdk bot commented Oct 9, 2020 • edited Loading

fisk left a comment

Choose a reason for hiding this comment

shipilev commented Oct 9, 2020

DamonFool commented Oct 9, 2020

openjdk bot commented Oct 9, 2020

DamonFool commented Oct 9, 2020 •

edited by openjdk bot

Loading

openjdk bot commented Oct 9, 2020 •

edited

Loading