Skip to content

Conversation

@JasonFengJ9
Copy link
Member

(Valhalla) Merge master HEAD into openj9-staging

Conflicts:

	make/Main.gmk
	make/autoconf/flags-ldflags.m4
	make/autoconf/spec.gmk.template
	make/conf/version-numbers.conf
	make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
	src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
	src/java.base/share/classes/java/lang/Thread.java
	src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
	src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
	src/java.base/share/native/libjava/System.c
	src/java.base/unix/native/libjli/java_md.c
	src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
	test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
	test/jdk/java/lang/Thread/virtual/stress/Skynet.java
	test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
	test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java
  • Merging openj9-openjdk-jdk/openj9 into openj9

Conflicts:

	make/autoconf/spec.gmk.template
	make/conf/version-numbers.conf
	src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
	src/java.base/share/classes/java/lang/Class.java
	src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
	src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
	src/java.base/share/classes/jdk/internal/misc/Unsafe.java
	src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
	src/java.base/unix/native/libjli/java_md.c
	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
	src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
	test/hotspot/jtreg/ProblemList.txt
	test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
	test/hotspot/jtreg/compiler/startup/StartupOutput.java
	test/hotspot/jtreg/runtime/ClassFile/ClassAccessFlagsRawTest.java
	test/jdk/ProblemList.txt
	test/jdk/java/lang/Thread/virtual/stress/Skynet.java
	test/langtools/tools/javac/flags/FlagsTest.java
  • Fix build failures
Adopt UNSAFE.arrayBaseOffset/arrayIndexScale/arrayLayout for array classes;
Replace warnOnExplicitStrictfp();
Remove Flags.IMPLICIT_CLASS annotation;
Add jdk.jdeps/ jdk.jfr to preview feature participation list.
Remove "%s/../lib"
  • Port head stream OpenJ9 branch PRs
Add build flag for strict fields -
https://github.com/ibmruntimes/openj9-openjdk-jdk.valuetypes/pull/18
Add OPENJDK_VERSION_STRING to openj9_version_info.h -
https://github.com/ibmruntimes/openj9-openjdk-jdk.valuetypes/pull/19
  • fix IllegalFormatConversionException
Port 8367619: String.format in outOfRangeException uses wrong format specifier for String argument
  • fix class file minor version

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

mhaessig and others added 30 commits August 21, 2025 07:09
…tions

Co-authored-by: Dean Long <dlong@openjdk.org>
Reviewed-by: dlong, chagedorn
…ng compilations

Reviewed-by: chagedorn, dholmes
This commit removes the Deadlock.sh test from the FIPS tests
exclusion list, as the test code has been removed.

Signed-off-by: Tao Liu <tao.liu@ibm.com>
Remove useless test from the FIPS tests exclusion list
…raggingTest.java fails on macOS 26

Reviewed-by: dnguyen, kizune
Reviewed-by: ayang, phh
…enuItemUI

Reviewed-by: psadhukhan, aivanov, dnguyen
Reviewed-by: fjiang, chagedorn, epeter, fyang
Signed-off-by: J9 Build <j9build@ca.ibm.com>
Signed-off-by: J9 Build <j9build@ca.ibm.com>
Update the RestrictedSecurity property test case to match
the new expected error message.

Signed-off-by: Tao Liu <tao.liu@ibm.com>
Update the RestrictedSecurity property test case
Signed-off-by: J9 Build <j9build@ca.ibm.com>
…uct if pattern" assert

Reviewed-by: mhaessig, thartmann, qamai
dev-koan and others added 24 commits September 9, 2025 15:03
Signed-off-by: Dev Agarwal dev.agarwal@ibm.com
Remove passing tests and add additional tests to the exclusion list
…va after current merges of JDK-8352737 and JDK-8366705

Reviewed-by: thartmann, dsimms
Merge jdk-26+1
…15 miss Valhalla specific profiling

Reviewed-by: thartmann
Merge jdk-26+2
Merge jdk-26+3
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Conflicts:
	make/Main.gmk
	make/autoconf/flags-ldflags.m4
	make/autoconf/spec.gmk.template
	make/conf/version-numbers.conf
	make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
	src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
	src/java.base/share/classes/java/lang/Thread.java
	src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
	src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
	src/java.base/share/native/libjava/System.c
	src/java.base/unix/native/libjli/java_md.c
	src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
	test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
	test/jdk/java/lang/Thread/virtual/stress/Skynet.java
	test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
	test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Conflicts:
	make/autoconf/spec.gmk.template
	make/conf/version-numbers.conf
	src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
	src/java.base/share/classes/java/lang/Class.java
	src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
	src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
	src/java.base/share/classes/jdk/internal/misc/Unsafe.java
	src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
	src/java.base/unix/native/libjli/java_md.c
	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
	src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
	src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
	test/hotspot/jtreg/ProblemList.txt
	test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
	test/hotspot/jtreg/compiler/startup/StartupOutput.java
	test/hotspot/jtreg/runtime/ClassFile/ClassAccessFlagsRawTest.java
	test/jdk/ProblemList.txt
	test/jdk/java/lang/Thread/virtual/stress/Skynet.java
	test/langtools/tools/javac/flags/FlagsTest.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Adopt UNSAFE.arrayBaseOffset/arrayIndexScale/arrayLayout for array classes;
Replace warnOnExplicitStrictfp();
Remove Flags.IMPLICIT_CLASS annotation;
Add jdk.jdeps/ jdk.jfr to preview feature participation list.

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Remove "%s/../lib"

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Add build flag for strict fields -
ibmruntimes#18
Add OPENJDK_VERSION_STRING to openj9_version_info.h -
ibmruntimes#19

Co-authored-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Port 8367619: String.format in outOfRangeException uses wrong format specifier for String argument

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Co-authored-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@JasonFengJ9
Copy link
Member Author

FYI @keithc-ca

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.