hg: valhalla/valhalla: Merge

david.holmes at oracle.com david.holmes at oracle.com
Wed Nov 28 08:11:09 UTC 2018


Changeset: d517835f3436
Author:    dholmes
Date:      2018-11-28 03:10 -0500
URL:       http://hg.openjdk.java.net/valhalla/valhalla/rev/d517835f3436

Merge

! make/hotspot/symbols/symbols-unix
! src/hotspot/share/ci/ciInstanceKlass.cpp
! src/hotspot/share/ci/ciInstanceKlass.hpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classLoaderData.cpp
! src/hotspot/share/classfile/classLoaderDataGraph.cpp
! src/hotspot/share/classfile/classLoaderDataGraph.hpp
! src/hotspot/share/classfile/classLoaderExt.cpp
! src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp
! src/hotspot/share/classfile/classLoaderStats.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/klassFactory.cpp
! src/hotspot/share/classfile/stackMapFrame.hpp
! 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/include/jvm.h
! src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
! src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/metaspace.cpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.hpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiExport.cpp
- src/hotspot/share/prims/privilegedStack.cpp
- src/hotspot/share/prims/privilegedStack.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.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/java/lang/reflect/Method.java
+ src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaAWTAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaAWTFontAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaBeansAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaIOAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaIOFilePermissionAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaIORandomAccessFileAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaLangInvokeAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaNetHttpCookieAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaNetInetAddressAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaNetSocketAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaNetURLAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaNetURLClassLoaderAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaNetUriAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaNioAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaObjectInputFilterAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaUtilJarAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaUtilResourceBundleAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaUtilZipFileAccess.java
- src/java.base/share/classes/jdk/internal/misc/JavaxCryptoSealedObjectAccess.java
- src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
- src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java
- src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m
- src/java.desktop/unix/classes/sun/awt/X11/genhash.awk
- src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h
- src/java.desktop/unix/legal/xwindows.md
- src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h
- src/java.desktop/unix/native/libawt_xawt/awt/randr.h
- src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c
- src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/internal/ReflectionAccessJDK.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ArrayOffsetProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc.test/src/org/graalvm/compiler/core/sparc/test/SPARCAllocatorTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringIndexOfOp.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/OpaqueNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/HashSetNodeEventListener.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeProbabilityCache.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringIndexOfNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/UnsafeReplacementsTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/VarHandleTest.java
! test/hotspot/jtreg/ProblemList.txt
- test/hotspot/jtreg/compiler/graalunit/CoreSparcTest.java
! test/hotspot/jtreg/runtime/Nestmates/membership/TestNestmateMembership.java
! test/jdk/ProblemList.txt
- test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html
- test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java
! test/jdk/java/lang/StackWalker/VerifyStackTrace.java
- test/jdk/java/lang/System/ClearProperty.java
- test/jdk/java/lang/System/SetPropertiesNull.java
- test/jdk/java/util/ResourceBundle/Bug6299235Test.java
- test/jdk/java/util/ResourceBundle/Bug6299235Test.sh
- test/jdk/java/util/ResourceBundle/awtres.jar
- test/jdk/java/util/ResourceBundle/modules/appbasic/appbasic.sh
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProviderImpl.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/basic.sh
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja_JP.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/asia/MyResources_vi.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/eu/MyResources_es.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesMain.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/layer/run.sh
- test/jdk/java/util/ResourceBundle/modules/modlocal/modlocal.sh
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/extra/jdk/test/resources/MyResources_vi.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/simple/simple.sh
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/unnamed/unnamed.sh
- test/jdk/java/util/ResourceBundle/modules/visibility/visibility.sh
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_de.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_en.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_fr.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_ja.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh_TW.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/xmlformat.sh
- test/jdk/java/util/TimeZone/Bug8066652.sh
- test/jdk/java/util/TimeZone/OldIDMappingTest.sh
- test/jdk/java/util/TimeZone/TimeZoneDatePermissionCheck.sh
- test/langtools/tools/jdeps/mrjar/test/Main.java



More information about the valhalla-dev mailing list