hg: jdk9/sandbox/jdk: 2 new changesets
aleksey.shipilev at oracle.com
aleksey.shipilev at oracle.com
Thu Apr 28 14:58:50 UTC 2016
Changeset: 1ac9205f4c4f
Author: shade
Date: 2016-04-28 17:41 +0300
URL: http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/1ac9205f4c4f
Merge
- make/launcher/Launcher-jdk.jvmstat.rmi.gmk
! src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
! src/java.base/share/classes/java/lang/invoke/Invokers.java
! src/java.base/share/classes/java/lang/invoke/MemberName.java
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/VarForm.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
- src/java.base/share/classes/java/lang/reflect/WeakCache.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
- src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtFileAttributes.java
- src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtFileSystem.java
- src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtPath.java
- src/java.base/share/classes/jdk/internal/jrtfs/JrtExplodedFileAttributes.java
- src/java.base/share/classes/jdk/internal/jrtfs/JrtExplodedFileSystem.java
- src/java.base/share/classes/jdk/internal/jrtfs/JrtExplodedPath.java
- src/java.base/share/classes/jdk/internal/jrtfs/SystemImages.java
! src/java.base/share/classes/jdk/internal/misc/Unsafe.java
- src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java
- src/java.base/share/classes/jdk/net/NetworkPermission.java
- src/java.base/share/classes/jdk/net/SocketFlow.java
- src/java.base/share/classes/jdk/net/Sockets.java
- src/java.base/share/classes/jdk/net/package-info.java
- src/java.base/share/classes/sun/misc/CRC16.java
- src/java.base/share/classes/sun/misc/Cache.java
- src/java.base/share/classes/sun/misc/ManagedLocalsThread.java
- src/java.base/share/classes/sun/misc/Signal.java
- src/java.base/share/classes/sun/misc/SignalHandler.java
- src/java.base/share/classes/sun/misc/SoftCache.java
- src/java.base/share/classes/sun/net/ExtendedOptionsImpl.java
- src/java.base/share/classes/sun/net/spi/nameservice/NameService.java
- src/java.base/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java
- src/java.base/share/classes/sun/reflect/AccessorGenerator.java
- src/java.base/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java
- src/java.base/share/classes/sun/reflect/ByteVector.java
- src/java.base/share/classes/sun/reflect/ByteVectorFactory.java
- src/java.base/share/classes/sun/reflect/ByteVectorImpl.java
- src/java.base/share/classes/sun/reflect/CallerSensitive.java
- src/java.base/share/classes/sun/reflect/ClassDefiner.java
- src/java.base/share/classes/sun/reflect/ClassFileAssembler.java
- src/java.base/share/classes/sun/reflect/ClassFileConstants.java
- src/java.base/share/classes/sun/reflect/ConstantPool.java
- src/java.base/share/classes/sun/reflect/ConstructorAccessor.java
- src/java.base/share/classes/sun/reflect/ConstructorAccessorImpl.java
- src/java.base/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java
- src/java.base/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java
- src/java.base/share/classes/sun/reflect/FieldAccessor.java
- src/java.base/share/classes/sun/reflect/FieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/FieldInfo.java
- src/java.base/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java
- src/java.base/share/classes/sun/reflect/Label.java
- src/java.base/share/classes/sun/reflect/LangReflectAccess.java
- src/java.base/share/classes/sun/reflect/MagicAccessorImpl.java
- src/java.base/share/classes/sun/reflect/MethodAccessor.java
- src/java.base/share/classes/sun/reflect/MethodAccessorGenerator.java
- src/java.base/share/classes/sun/reflect/MethodAccessorImpl.java
- src/java.base/share/classes/sun/reflect/NativeConstructorAccessorImpl.java
- src/java.base/share/classes/sun/reflect/NativeMethodAccessorImpl.java
- src/java.base/share/classes/sun/reflect/Reflection.java
- src/java.base/share/classes/sun/reflect/ReflectionFactory.java
- src/java.base/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java
- src/java.base/share/classes/sun/reflect/SignatureIterator.java
- src/java.base/share/classes/sun/reflect/UTF8.java
- src/java.base/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeCharacterFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java
- src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticFloatFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java
- src/java.base/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java
- src/java.base/unix/classes/sun/misc/GThreadHelper.java
- src/java.base/unix/native/libnet/ExtendedOptionsImpl.c
- src/java.base/windows/native/libnet/ExtendedOptionsImpl.c
! src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
- src/jdk.jlink/share/classes/jdk/tools/jimage/ExtractedImage.java
- src/jdk.jvmstat.rmi/share/classes/module-info.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/monitor/remote/package.html
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html
- src/jdk.jvmstat.rmi/share/classes/sun/tools/jstatd/Jstatd.java
- src/jdk.jvmstat.rmi/share/classes/sun/tools/jstatd/RemoteHostImpl.java
- src/jdk.jvmstat.rmi/share/classes/sun/tools/jstatd/RemoteVmImpl.java
- src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
- src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java
- src/jdk.rmic/share/classes/jdk/rmi/rmic/Main.java
! src/jdk.unsupported/share/classes/sun/misc/Unsafe.java < src/java.base/share/classes/sun/misc/Unsafe.java
! test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
! test/java/lang/invoke/VarHandles/VarHandleTestReflection.java
! test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
- test/java/net/Inet4Address/DummyNameService.java
- test/java/net/Inet4Address/DummyNameServiceDescriptor.java
- test/java/net/Inet4Address/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/URLPermission/nstest/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/URLPermission/nstest/SimpleNameService.java
- test/java/net/URLPermission/nstest/SimpleNameServiceDescriptor.java
! test/java/rmi/transport/httpSocket/HttpSocketTest.java
! test/java/rmi/transport/httpSocket/HttpSocketTest_Stub.java
! test/java/rmi/transport/httpSocket/security.policy
- test/java/util/ServiceLoader/modules/BasicTest.java
- test/sanity/client/lib/Jemmy2Ext/src/org/jemmy2ext/JemmyExt.java
- test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/chaining/Providers.java
- test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java
- test/sun/net/InetAddress/nameservice/chaining/Simple2NameServiceDescriptor.java
- test/sun/net/InetAddress/nameservice/chaining/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/deadlock/Hang.java
- test/sun/net/InetAddress/nameservice/deadlock/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameService.java
- test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameServiceDescriptor.java
- test/sun/net/InetAddress/nameservice/simple/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/simple/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/simple/SimpleNameServiceDescriptor.java
- test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java
- test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java
- test/sun/reflect/CallerSensitive/MissingCallerSensitive.java
- test/sun/reflect/Reflection/GetCallerClass.java
- test/sun/reflect/Reflection/GetCallerClassTest.java
- test/sun/reflect/Reflection/GetCallerClassTest.sh
- test/sun/reflect/constantPool/ConstantPoolTest.java
- test/sun/reflect/constantPool/ConstantPoolTestDummy.jasm
! test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java
! test/sun/rmi/transport/proxy/EagerHttpFallback.java
! test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
! test/sun/rmi/transport/tcp/blockAccept/TestIface.java
! test/sun/rmi/transport/tcp/blockAccept/TestImpl.java
! test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java
- test/sun/security/krb5/auto/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/security/krb5/canonicalize/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/security/x509/URICertStore/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
Changeset: 1f240f48bfc6
Author: shade
Date: 2016-04-28 17:58 +0300
URL: http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/1f240f48bfc6
weakCASVolatile change + badCAE fix
! src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
! src/java.base/share/classes/java/lang/invoke/Invokers.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
! src/java.base/share/classes/java/lang/invoke/MethodType.java
! src/java.base/share/classes/java/lang/invoke/VarForm.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java
! src/java.base/share/classes/java/lang/invoke/VarHandles.java
! src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
! src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
! test/java/lang/invoke/VarHandles/VarHandleBaseTest.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
! test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
! test/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
! test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
More information about the jdk9-sandbox-changes
mailing list