(valhalla) Merging openj9-openjdk-jdk/openj9 into openj9-staging #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…em property Reviewed-by: mullan, weijun
Reviewed-by: honkar, prr
… close set 2 Reviewed-by: tr, achung, aivanov
Reviewed-by: erikj
Reviewed-by: erikj
… close set 1 Reviewed-by: honkar, achung, aivanov
Merge master HEAD into openj9-staging
…ble to test across file systems Reviewed-by: alanb
Reviewed-by: dfuchs, jpai
Reviewed-by: abhiscxk, dnguyen, prr, aivanov
Reviewed-by: kvn
- exclude FIPS test in JDK23 to match JDK22/JDK21 related:https://github.ibm.com/runtimes/backlog/issues/1397 Signed-off-by: Anna Babu Palathingal <[email protected]>
Update FIPS test exclude file for JDK23
Reviewed-by: dnguyen, abhiscxk, honkar
…mation Reviewed-by: coleenp, sspitsyn
Signed-off-by: J9 Build <[email protected]>
…nsic when allocation is eliminated by EA Reviewed-by: thartmann, kvn
Reviewed-by: jkarthikeyan, thartmann, chagedorn
Reviewed-by: ayang, ysr
Reviewed-by: jiefu, tschatzl, lmesnik
Reviewed-by: iklam, kvn, kbarrett
…stead of ValhallaFeatures Reviewed-by: mchung
Reviewed-by: jlahoda
…thods Reviewed-by: jlahoda
Reviewed-by: iris, erikj, ihse
Reviewed-by: bpb, iris, rgiulietti
Reviewed-by: michaelm, jpai
Reviewed-by: mbalao, rhalade
Reviewed-by: sviswanathan, epeter, psandoz
Reviewed-by: sviswanathan, jbhateja, kvn
…n Predicates Reviewed-by: epeter, kvn
Reviewed-by: chagedorn, stefank, thartmann
…tstraps$TypePairs Reviewed-by: jlahoda, mchung
Reviewed-by: mchung
Reviewed-by: shade, dcubed
Reviewed-by: tbell
…sted synchronized blocks Reviewed-by: jlahoda
Signed-off-by: Peter Shipton <[email protected]>
…aglet Reviewed-by: prappo
…lds in value classes
…tests Reviewed-by: iris
Signed-off-by: Peter Shipton <[email protected]>
Signed-off-by: J9 Build <[email protected]>
Reviewed-by: heidinga
* eliminate repetitive option processing * ignore '--parallel' option * handle special openssl options and treat like other repos * remove old, unused scripts Signed-off-by: Keith W. Campbell <[email protected]>
Merge scripts to fetch or update source repositories
…ding to crashes Reviewed-by: thartmann
Signed-off-by: Jason Feng <[email protected]>
Conflicts: closed/src/java.base/share/classes/sun/security/provider/NativeSHA.java src/java.base/share/classes/java/lang/String.java src/java.base/share/classes/java/lang/classfile/instruction/package-info.java src/java.base/share/native/libjava/AtomicLong.c test/langtools/tools/javac/valhalla/value-objects/IllegalMonitorStateExceptionTest.java Signed-off-by: Jason Feng <[email protected]>
Conflicts: closed/OpenJ9.gmk make/Images.gmk make/conf/version-numbers.conf make/data/hotspot-symbols/symbols-unix make/modules/java.base/Java.gmk make/test/BuildMicrobenchmark.gmk src/java.base/share/classes/java/lang/String.java src/java.base/share/classes/java/lang/StringUTF16.java src/java.base/share/classes/java/lang/VirtualThread.java src/java.base/share/classes/java/lang/classfile/Attribute.java src/java.base/share/classes/java/lang/classfile/Attributes.java src/java.base/share/classes/java/lang/classfile/ClassElement.java src/java.base/share/classes/java/lang/classfile/ClassFile.java src/java.base/share/classes/java/lang/classfile/Opcode.java src/java.base/share/classes/java/lang/classfile/package-info.java src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java src/java.base/share/classes/java/lang/reflect/Modifier.java src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java src/java.base/share/classes/jdk/internal/misc/Unsafe.java src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java src/java.base/share/classes/sun/invoke/util/VerifyAccess.java src/java.base/windows/native/libjava/jni_util_md.h src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryContext.java src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/ProgramDescriptor.java src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/RelevantJavacOptions.java src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java src/jdk.compiler/share/data/symbols/java.datatransfer-M.sym.txt src/jdk.compiler/share/data/symbols/java.instrument-M.sym.txt src/jdk.compiler/share/data/symbols/java.logging-M.sym.txt src/jdk.compiler/share/data/symbols/java.management.rmi-M.sym.txt src/jdk.compiler/share/data/symbols/java.naming-M.sym.txt src/jdk.compiler/share/data/symbols/java.rmi-M.sym.txt src/jdk.compiler/share/data/symbols/java.scripting-M.sym.txt src/jdk.compiler/share/data/symbols/java.security.jgss-M.sym.txt src/jdk.compiler/share/data/symbols/java.security.sasl-M.sym.txt src/jdk.compiler/share/data/symbols/java.smartcardio-M.sym.txt src/jdk.compiler/share/data/symbols/java.sql-M.sym.txt src/jdk.compiler/share/data/symbols/java.sql.rowset-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.accessibility-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.attach-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.crypto.ec-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.dynalink-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.httpserver-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.internal.ed-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.javadoc-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.jconsole-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.jdi-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.jdwp.agent-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.jsobject-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.management-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.net-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.sctp-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.security.auth-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.security.jgss-M.sym.txt src/jdk.compiler/share/data/symbols/jdk.xml.dom-M.sym.txt src/jdk.compiler/share/data/symbols/symbols src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java src/jdk.javadoc/share/man/javadoc.1 src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedMethods.java src/jdk.jfr/share/classes/jdk/jfr/internal/test/DeprecatedThing.java src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp test/hotspot/gtest/classfile/test_symbolTable.cpp test/hotspot/gtest/oops/test_markWord.cpp test/hotspot/jtreg/ProblemList.txt test/hotspot/jtreg/compiler/c2/irTests/TestOptimizeUnstableIf.java test/hotspot/jtreg/compiler/codecache/CheckLargePages.java test/hotspot/jtreg/compiler/vectorapi/reshape/utils/TestCastMethods.java test/hotspot/jtreg/gc/g1/TestAllocationFailure.java test/hotspot/jtreg/gc/g1/TestGCLogMessages.java test/hotspot/jtreg/runtime/clinit/libClassInitBarrier.cpp test/hotspot/jtreg/runtime/os/HugePageConfiguration.java test/hotspot/jtreg/runtime/os/TestTracePageSizes.java test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp test/jdk/ProblemList-FIPS140_3_OpenJcePlus.txt test/jdk/ProblemList-Virtual.txt test/jdk/ProblemList.txt test/jdk/com/sun/crypto/provider/Cipher/AEAD/AEADBufferTest.java test/jdk/java/awt/regtesthelpers/PassFailJFrame.java test/jdk/java/foreign/critical/TestCriticalUpcall.java test/jdk/java/lang/Class/GenericStringTest.java test/jdk/java/lang/ModuleTests/AnnotationsTest.java test/jdk/java/lang/String/Chars.java test/jdk/java/lang/Thread/virtual/ThreadAPI.java test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java test/jdk/java/lang/reflect/records/IsRecordTest.java test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneArrowDirection.java test/jdk/jdk/classfile/ClassPrinterTest.java test/jdk/jdk/classfile/CorpusTest.java test/jdk/jdk/classfile/LimitsTest.java test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java test/langtools/tools/javac/AnonymousClass/AnonymousClassFlags.java test/langtools/tools/javac/MethodParameters/LegacyOutputTest/LegacyOutputTest.java test/langtools/tools/javac/classfiles/InnerClasses/SyntheticClasses.java test/langtools/tools/javac/diags/examples.not-yet.txt test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java test/langtools/tools/javac/launcher/GetResourceTest.java test/langtools/tools/javac/launcher/MultiFileSourceLauncherTests.java test/langtools/tools/javac/launcher/SourceLauncherTest.java test/langtools/tools/javac/valhalla/value-objects/separate_compilation/AbstractValueSuper.java test/lib/jdk/test/lib/process/OutputBuffer.java test/lib/org/openjdk/asmtools/i18n.properties test/lib/org/openjdk/asmtools/jcdec/i18n.properties test/lib/org/openjdk/asmtools/jdec/i18n.properties test/lib/org/openjdk/asmtools/util/productinfo.properties test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java Modified: src/java.base/share/classes/java/lang/invoke/MethodHandles.java src/java.base/share/classes/jdk/internal/classfile/impl/ClassPrinterImpl.java Signed-off-by: Jason Feng <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(valhalla) Merging openj9-openjdk-jdk/openj9 into openj9-staging
Conflicts:
Modified:
Signed-off-by: Jason Feng [email protected]