hg: valhalla/valhalla: Merge

David Holmes david.holmes at oracle.com
Fri Dec 15 08:10:06 UTC 2017


This change includes the update to classfile version 54. That breaks one 
of the classfile parsing tests at the moment but I'll rectify that as 
part of 8191114 as I'll need to update all the jcod files to use 
classfile version 54.

David

On 15/12/2017 5:58 PM, david.holmes at oracle.com wrote:
> Changeset: d6d3732ca31d
> Author:    dholmes
> Date:      2017-12-14 00:39 -0500
> URL:       http://hg.openjdk.java.net/valhalla/valhalla/rev/d6d3732ca31d
> 
> Merge
> 
> ! make/mapfiles/libjava/mapfile-vers
> ! src/hotspot/share/classfile/classFileParser.cpp
> ! src/hotspot/share/classfile/systemDictionary.cpp
> ! src/hotspot/share/classfile/vmSymbols.hpp
> - src/hotspot/share/classfile/vmSymbols_ext.hpp
> - src/hotspot/share/gc/g1/hSpaceCounters.cpp
> - src/hotspot/share/gc/g1/hSpaceCounters.hpp
> ! src/hotspot/share/logging/logTag.hpp
> ! src/hotspot/share/oops/constantPool.cpp
> ! src/hotspot/share/prims/jvm.cpp
> - src/hotspot/share/services/g1MemoryPool.cpp
> - src/hotspot/share/services/g1MemoryPool.hpp
> - src/hotspot/share/services/jmm.h
> - src/hotspot/share/services/psMemoryPool.cpp
> - src/hotspot/share/services/psMemoryPool.hpp
> ! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
> ! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
> ! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
> ! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
> - src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java
> - src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java
> - src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java
> - src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java
> - src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java
> - src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractPushPublisher.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncConnection.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLDelegate.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BlockingPushPublisher.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/DefaultPublisher.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExecutorWrapper.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PseudoPublisher.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushPublisher.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestProcessors.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseHeaders.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseProcessors.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLConnection.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLTunnelConnection.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncDataReadQueue.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/AsyncWriteQueue.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/BufferHandler.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Queue.java
> - src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CooperativeHandler.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/RawAddressNode.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java
> - src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java
> - test/hotspot/jtreg/gc/metaspace/PerfCounter.java
> - test/hotspot/jtreg/gc/metaspace/PerfCounters.java
> - test/java/util/Calendar/Bug8185841.java
> ! test/jdk/ProblemList.txt
> - test/jdk/java/io/FileInputStream/FinalizeShdCallClose.java
> - test/jdk/java/io/FileOutputStream/FinalizeShdCallClose.java
> - test/jdk/java/net/httpclient/APIErrors.java
> - test/jdk/java/net/httpclient/Server.java
> - test/jdk/java/net/httpclient/http2/HpackDriver.java
> - test/jdk/java/net/httpclient/http2/HpackDriverHeaderTable.java
> - test/jdk/java/net/httpclient/http2/NoBody.java
> - test/jdk/java/net/httpclient/http2/server/RedirectHandler.java
> - test/jdk/java/net/httpclient/websocket/LoggingHelper.java
> - test/jdk/java/net/httpclient/websocket/WSDriver.java
> - test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/CloseTest.java
> - test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/DataProviders.java
> - test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannel.java
> - test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockChannelTest.java
> - test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListenerTest.java
> - test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/PingTest.java
> - test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ResponseHeadersTest.java
> - test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java
> - test/jdk/lib/testlibrary/jdk/testlibrary/RandomFactory.java
> - test/langtools/jdk/javadoc/doclet/testBadPackageFileInJar/badPackageFileInJar.jar
> - test/langtools/jdk/javadoc/doclet/testGroupOption/C.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/A.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/B.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/C.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/X.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/Z.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/A.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/B.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/C.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseClass.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseInterface.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/SubClass.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Implementer.java
> - test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Interface.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestMultiInheritence.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverrideMethods.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenMethodDocCopy.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethods.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/BaseClass.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/SubClass.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg2/SubClass.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I0.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I1.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I2.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I3.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I4.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg4/Foo.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg5/Classes.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg5/Interfaces.java
> - test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg5/TestEnum.java
> - test/langtools/tools/javac/T5090006/AssertionFailureTest.java
> - test/langtools/tools/javac/T5090006/broken.jar
> 


More information about the valhalla-dev mailing list