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

Append cp to method annotation data to fix redefinition inconsistencies #705

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Append cp to method annotation data to fix redefinition inconsistencies #705

merged 1 commit into from
Nov 17, 2023

Conversation

theresa-m
Copy link
Contributor

@theresa-m
Copy link
Contributor Author

theresa-m commented Nov 9, 2023 •
edited
Loading

@tajila can you please review this change?

There are a few more places I think the inconsistency can occur:

@theresa-m theresa-m mentioned this pull request Nov 9, 2023
Merged
@theresa-m
Copy link
Contributor Author

Also what's the correct way to resolve this copyright failure?

tajila
tajila reviewed Nov 9, 2023
View reviewed changes
jdk/src/share/classes/java/lang/reflect/Executable.java Outdated
@@ -77,10 +82,19 @@ boolean equalParamTypes(Class<?>[] params1, Class<?>[] params2) {
}

Annotation[][] parseParameterAnnotations(byte[] parameterAnnotations) {
long offset = Unsafe.ARRAY_BYTE_BASE_OFFSET + ((parameterAnnotations.length * Unsafe.ARRAY_BYTE_INDEX_SCALE) - VM.FJ9OBJECT_SIZE);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can put this code, line 85-93 in a helper in com.ibm.oti.vm.VM.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May as well address all the other places in this PR

@tajila
Copy link
Member

tajila commented Nov 9, 2023

Also what's the correct way to resolve this copyright failure?

you need to add

/*
 * ===========================================================================
 * (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved
 * ===========================================================================
 */

@theresa-m theresa-m force-pushed the parseannotation branch 3 times, most recently from a1a6802 to 6c8473b Compare November 10, 2023 15:15
@theresa-m
Fix extensions annotation and constantpool inconsistencies
87413fb 
Missing cases from eclipse-openj9/openj9#14063

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
@theresa-m
Copy link
Contributor Author

theresa-m commented Nov 14, 2023 •
edited
Loading

@tajila can you take another look?

edit: sorry just saw Hang's comments on the openj9 pr, I'm updating from his comments.

@theresa-m theresa-m mentioned this pull request Nov 15, 2023
Merged
theresa-m added a commit to theresa-m/openj9-openjdk-jdk17 that referenced this pull request Nov 15, 2023
@theresa-m
Append cp to annotation data to fix redefinition inconsistencies
26b5740 
Port to Java 17 from ibmruntimes/openj9-openjdk-jdk8#705

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
@theresa-m theresa-m mentioned this pull request Nov 15, 2023
Merged
@theresa-m
Copy link
Contributor Author

theresa-m commented Nov 15, 2023 •
edited
Loading

Starting a list here of ports:

theresa-m added a commit to theresa-m/openj9-openjdk-jdk21 that referenced this pull request Nov 15, 2023
@theresa-m
Append cp to annotation data to fix redefinition inconsistencies
f32b836 
Port to Java 11 from ibmruntimes/openj9-openjdk-jdk8#705

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
@theresa-m theresa-m mentioned this pull request Nov 15, 2023
Merged
theresa-m added a commit to theresa-m/openj9-openjdk-jdk that referenced this pull request Nov 15, 2023
@theresa-m
Append cp to annotation data to fix redefinition inconsistencies
2f1a5de 
Port to Java next from ibmruntimes/openj9-openjdk-jdk8#705

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
@theresa-m theresa-m mentioned this pull request Nov 15, 2023
Merged
theresa-m added a commit to theresa-m/openj9-openjdk-jdk21 that referenced this pull request Nov 15, 2023
@theresa-m
Append cp to annotation data to fix redefinition inconsistencies
141f67b 
Port to Java 21 from ibmruntimes/openj9-openjdk-jdk8#705

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
@tajila
Copy link
Member

tajila commented Nov 16, 2023

jenkins test sanity alinux64 jdk8 depends eclipse-openj9/openj9#18437

@tajila tajila merged commit 4b03d79 into ibmruntimes:openj9 Nov 17, 2023
5 checks passed
tajila pushed a commit to ibmruntimes/openj9-openjdk-jdk11 that referenced this pull request Nov 17, 2023
@theresa-m
Append cp to annotation data to fix redefinition inconsistencies
d39cff5 
Port to Java 11 from ibmruntimes/openj9-openjdk-jdk8#705

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
theresa-m added a commit to theresa-m/openj9-openjdk-jdk21 that referenced this pull request Nov 20, 2023
@theresa-m
Append cp to annotation data to fix redefinition inconsistencies
e696229 
Port to Java 21 from ibmruntimes/openj9-openjdk-jdk8#705

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
theresa-m added a commit to theresa-m/openj9-openjdk-jdk21 that referenced this pull request Nov 20, 2023
@theresa-m
Append cp to annotation data to fix redefinition inconsistencies
ba88429 
Port to Java 21 from ibmruntimes/openj9-openjdk-jdk8#705

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
This was referenced Nov 20, 2023
Merged
Merged
Merged
@theresa-m theresa-m mentioned this pull request Nov 20, 2023
Merged
@pshipton
Copy link
Member

pshipton commented Aug 2, 2024

Port to IBM Java 8 via 150780.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tajila tajila tajila approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@theresa-m @tajila @pshipton