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

Fix DDR field inconsistency in mixed refs builds #5758

Merged
merged 1 commit into from
Jan 21, 2021

Conversation

sharon-wang
Copy link
Contributor

@sharon-wang sharon-wang commented Jan 19, 2021

Fixes: eclipse-openj9/openj9#11469
OpenJ9 equivalent changes: eclipse-openj9/openj9#11691

  • 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)

Related: eclipse-openj9/openj9#8878, eclipse-openj9/openj9#11166

gc/base/MemoryPool.hpp Outdated Show resolved Hide resolved
gc/base/SlotObject.hpp Outdated Show resolved Hide resolved
Remove !defined(OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES) from
preprocessor guard of _compressObjectReferences field

Make _compressObjectReferences a protected field

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

I've run these changes against the failing tests and they are now passing.

@sharon-wang
Copy link
Contributor Author

@dmitripivkine Could you please review?

@sharon-wang
Copy link
Contributor Author

@fjeremic This should be ready to build!

@fjeremic fjeremic self-assigned this Jan 20, 2021
@fjeremic
Copy link
Contributor

@genie-omr build all

@sharon-wang
Copy link
Contributor Author

@fjeremic looks like this is good to merge!

@fjeremic fjeremic merged commit cf8c5aa into eclipse-omr:master Jan 21, 2021
@sharon-wang sharon-wang deleted the corprotected branch January 26, 2021 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cmdLineTester_callsitedbgddrext_openj9 test failing with mixed references build
5 participants