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.

Sign up for GitHub

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

Jump to bottom

Fix DDR field inconsistency in mixed refs builds #11691

Merged
merged 1 commit into from
Jan 20, 2021
Merged

Fix DDR field inconsistency in mixed refs builds #11691

merged 1 commit into from
Jan 20, 2021

Conversation

sharon-wang
Copy link
Contributor

@sharon-wang sharon-wang commented Jan 19, 2021 •
edited
Loading

Fixes: #11469
OMR changes: eclipse-omr/omr#5758

  • Remove !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) from preprocessor guard of _compressObjectReferences field
  • Make _compressObjectReferences a protected field in header files that declare it -- keeping it as a private field while removing the OVERRIDE check causes clang to error on osx (-Wunused-private-field)

I ran the failing test cmdLineTester_callsitedbgddrext_openj9_0 with these changes and omr changes on the failing platforms ppc64_aix_mixed and s390x_linux_mixed, and I've built locally on mac -- all are passing.

Related: #8878, #11166

This was referenced Jan 19, 2021
Merged
Closed
keithc-ca
keithc-ca requested changes Jan 19, 2021
View reviewed changes
runtime/gc_base/ObjectAccessBarrier.cpp Outdated Show resolved Hide resolved
runtime/gc_include/ObjectAccessBarrierAPI.hpp Outdated Show resolved Hide resolved
runtime/gc_include/ObjectAccessBarrierAPI.hpp Outdated Show resolved Hide resolved
@sharon-wang
Fix DDR field inconsistency in mixed refs builds
9e27c71 
Remove !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) from
preprocessor guard of _compressObjectReferences field

Make _compressObjectReferences a protected field

[skip ci]

Signed-off-by: Sharon Wang <sharon-wang-cpsc@outlook.com>
@sharon-wang
Copy link
Contributor Author

Addressed comments and tested against the failing tests -- they are now passing.

@sharon-wang
Copy link
Contributor Author

Jenkins shortnames for mixed refs CMake builds:

aixmxd: ppc64_aix_mixed
zlinuxmxd: s390x_linux_mixed
plinuxmxd: ppc64le_linux_mixed
xlinuxmxd: x86-64_linux_mixed
winmxd: x86-64_windows_mixed
osxmxd: x86-64_mac_mixed
alinux64mxd: aarch64_linux_mixed

These changes need to be run with eclipse-omr/omr#5758, or eclipse-omr/omr#5758 needs to get merged and become available on the openj9 branch first.

@gacholio
Copy link
Contributor

jenkins test sanity zlinux jdk8

@gacholio
Copy link
Contributor

jenkins test sanity plinuxmxd jdk11

@gacholio
Copy link
Contributor

Ah didn't realize the changes were dependent. I'll relaunch testing after the OMR code is merged.

@gacholio
Copy link
Contributor

Actually, there's no reason they would be dependent, and the PR builds here are working fine, so I'll merge this when the testing completes.

@gacholio
Copy link
Contributor

jenkins compile win jdk8 depends eclipse-omr/omr#5758

@gacholio gacholio merged commit 1707c3f into eclipse-openj9:master Jan 20, 2021
@pshipton
Copy link
Member

Note that plinux always passed, it was zlinux & AIX (Big Endian) platforms that failed.

@sharon-wang sharon-wang deleted the corprotected branch January 26, 2021 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gacholio gacholio gacholio approved these changes

@keithc-ca keithc-ca keithc-ca approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cmdLineTester_callsitedbgddrext_openj9 test failing with mixed references build
4 participants
@sharon-wang @gacholio @pshipton @keithc-ca