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

Update the value of ACC_VALUE and remove j.l.IdentityObject #15130

Merged
merged 1 commit into from
May 31, 2022

Conversation

hangshao0
Copy link
Contributor

@hangshao0 hangshao0 commented May 26, 2022

  1. Update the value of ACC_VALUE
  2. remove ACC_PERMITS_VALUE
  3. Add ACC_IDENTITY
  4. remove IdentityObject
  5. Update test code
  6. Re-include PackageAnnotation tests which were excluded because of
    the injected j.l.IdentityObject.
  7. OpenJDK ASM code is not updated for ACC_IDENTITY yet, it does not
    allow ACC_IDENTITY to be set. Exclude tests testGCRetransform and
    test_EXTENDED_HCR which failed on access flags check of ACC_IDENTITY

issue #15081, #12878

Signed-off-by: Hang Shao hangshao@ca.ibm.com

1. Update the value of ACC_VALUE
2. remove ACC_PERMITS_VALUE
3. Add ACC_IDENTITY
4. remove IdentityObject
5. Update test code
6. Re-include PackageAnnotation tests which were excluded because of 
the injected j.l.IdentityObject.
7. OpenJDK ASM code is not updated for ACC_IDENTITY yet, it does not
allow ACC_IDENTITY to be set. Exclude tests testGCRetransform and
test_EXTENDED_HCR which failed on access flags check of ACC_IDENTITY

issue eclipse-openj9#15081, eclipse-openj9#12878

Signed-off-by: Hang Shao <hangshao@ca.ibm.com>
@hangshao0
Copy link
Contributor Author

Because OpenJDK updated the value of ACC_VALUE, the valhalla builds are broken. This PR should unblock the valhalla builds.

@tajila
Copy link
Contributor

tajila commented May 30, 2022

Jenkins test sanity,extended xlinuxval jdknext

@tajila
Copy link
Contributor

tajila commented May 30, 2022

Jenkins test sanity win jdk8

@tajila
Copy link
Contributor

tajila commented May 30, 2022

Jenkins test sanity alinuxvalst jdknext

@tajila tajila merged commit 9ecb020 into eclipse-openj9:master May 31, 2022
@pshipton
Copy link
Member

@hangshao0 @tajila this broke at least internal DDR compilation. See /job_output.php?id=35316088
Pls fix quickly or revert.

    [javac] /tmp/bld_29819/job_35316088/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java:225: error: cannot find symbol
    [javac] 			return romClass.modifiers().allBitsIn(J9JavaAccessFlags.J9AccPermitsValue);
    [javac] 			                                                       ^
    [javac]   symbol:   variable J9AccPermitsValue
    [javac]   location: class J9JavaAccessFlags

@keithc-ca
Copy link
Contributor

I have a small change that should fix this. I'll launch an internal build to verify first.

@keithc-ca
Copy link
Contributor

#15150 should fix the internal build failure.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants