Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Merge master jdk-19+33 into openj9-staging #19

Merged
merged 9 commits into from
Aug 3, 2022

Conversation

JasonFengJ9
Copy link
Member

Resolved conflicts:

	src/java.base/share/classes/jdk/internal/foreign/CABI.java
	src/java.base/share/classes/jdk/internal/foreign/PlatformLayouts.java

Signed-off-by: Jason Feng fengj@ca.ibm.com

dnakamura and others added 9 commits July 21, 2022 10:45
Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>
Backport-of: d7f0de272c85ee8d0890c9d61e10065b618b69d7
* revert changes to LayoutPath.java
* revert changes to X-VarHandleSegmentView.java.template
* restore alignment checks
* remove redundant '? true : false'
* correct indentation, formatting
* compare pointers with NULL, not 0
* adjust NativeTestHelper for AIX
* update alignments of double, long, pointer for AIX

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Conflicts:
	src/java.base/share/classes/jdk/internal/foreign/CABI.java
	src/java.base/share/classes/jdk/internal/foreign/PlatformLayouts.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@JasonFengJ9 JasonFengJ9 requested a review from keithc-ca July 29, 2022 13:01
@keithc-ca keithc-ca merged commit c2c80f7 into ibmruntimes:openj9-staging Aug 3, 2022
@JasonFengJ9 JasonFengJ9 deleted the mergetmp branch August 3, 2022 15:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants