hg: valhalla/valhalla: Merge

david.holmes at oracle.com david.holmes at oracle.com
Thu Mar 26 01:36:58 UTC 2020


Changeset: aa67336b5f17
Author:    dholmes
Date:      2020-03-25 21:31 -0400
URL:       https://hg.openjdk.java.net/valhalla/valhalla/rev/aa67336b5f17

Merge

- make/CompileInterimRmic.gmk
- make/common/RMICompilation.gmk
- make/rmic/Rmic-java.management.rmi.gmk
- make/rmic/Rmic-java.rmi.gmk
- make/rmic/Rmic-jdk.naming.rmi.gmk
- make/rmic/RmicCommon.gmk
- src/demo/share/jfc/Font2DTest/Font2DTestApplet.java
- src/demo/share/jfc/SwingSet2/SwingSet2Applet.java
! src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
! src/hotspot/cpu/sparc/templateTable_sparc.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classLoader.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/klassFactory.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/systemDictionaryShared.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/gc/shared/concurrentGCPhaseManager.cpp
- src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/opto/c2compiler.cpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java
- src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
! src/java.base/share/classes/java/lang/ClassLoader.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
! src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
! src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
! src/java.base/share/native/libjava/ClassLoader.c
- src/java.base/unix/classes/java/lang/ClassLoaderHelper.java
- src/java.base/windows/classes/java/lang/ClassLoaderHelper.java
- src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java
- src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java
- src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java
! test/hotspot/jtreg/ProblemList.txt
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckControl.java
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckSupported.java
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckUnsupported.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java
- test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java
- test/hotspot/jtreg/gc/g1/TestJNIWeakG1/libTestJNIWeakG1.c
! test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
! test/jdk/ProblemList.txt
- test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html
- test/jdk/sun/management/jmxremote/bootstrap/Makefile
- test/jdk/sun/management/jmxremote/bootstrap/launcher.c
- test/jdk/sun/management/jmxremote/bootstrap/linux-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/linux-i586/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher
- test/langtools/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java



More information about the valhalla-dev mailing list