Merge
authorduke
Wed, 05 Jul 2017 21:35:33 +0200
changeset 37377 bd3b98a11a14
parent 37376 5daa5fbad3ce (diff)
parent 37374 ee1b8619eddb (current diff)
child 37380 55c2549714af
Merge
hotspot/src/share/vm/gc/shared/liveRange.hpp
hotspot/src/share/vm/runtime/logTimer.hpp
hotspot/test/compiler/dependencies/MonomorphicObjectCall/java/lang/Object.java
jdk/src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtFileAttributes.java
jdk/src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtFileSystem.java
jdk/src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtPath.java
jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtExplodedFileAttributes.java
jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtExplodedFileSystem.java
jdk/src/java.base/share/classes/jdk/internal/jrtfs/JrtExplodedPath.java
jdk/src/java.base/share/classes/jdk/internal/jrtfs/SystemImages.java
jdk/src/java.base/share/classes/sun/reflect/AccessorGenerator.java
jdk/src/java.base/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/ByteVector.java
jdk/src/java.base/share/classes/sun/reflect/ByteVectorFactory.java
jdk/src/java.base/share/classes/sun/reflect/ByteVectorImpl.java
jdk/src/java.base/share/classes/sun/reflect/CallerSensitive.java
jdk/src/java.base/share/classes/sun/reflect/ClassDefiner.java
jdk/src/java.base/share/classes/sun/reflect/ClassFileAssembler.java
jdk/src/java.base/share/classes/sun/reflect/ClassFileConstants.java
jdk/src/java.base/share/classes/sun/reflect/ConstantPool.java
jdk/src/java.base/share/classes/sun/reflect/ConstructorAccessor.java
jdk/src/java.base/share/classes/sun/reflect/ConstructorAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/FieldAccessor.java
jdk/src/java.base/share/classes/sun/reflect/FieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/FieldInfo.java
jdk/src/java.base/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/Label.java
jdk/src/java.base/share/classes/sun/reflect/LangReflectAccess.java
jdk/src/java.base/share/classes/sun/reflect/MagicAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/MethodAccessor.java
jdk/src/java.base/share/classes/sun/reflect/MethodAccessorGenerator.java
jdk/src/java.base/share/classes/sun/reflect/MethodAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/NativeConstructorAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/NativeMethodAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/Reflection.java
jdk/src/java.base/share/classes/sun/reflect/ReflectionFactory.java
jdk/src/java.base/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/SignatureIterator.java
jdk/src/java.base/share/classes/sun/reflect/UTF8.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeCharacterFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticFloatFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java
jdk/src/jdk.rmic/share/classes/jdk/rmi/rmic/Main.java
jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java
jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java
jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java
jdk/test/sun/reflect/Reflection/GetCallerClass.java
jdk/test/sun/reflect/Reflection/GetCallerClassTest.java
jdk/test/sun/reflect/Reflection/GetCallerClassTest.sh
jdk/test/sun/reflect/constantPool/ConstantPoolTest.java
jdk/test/sun/reflect/constantPool/ConstantPoolTestDummy.jasm
test/failure_handler/src/windows/native/jdk/test/failurehandler/jtreg/GatherProcessInfoTimeoutHandler.c
--- a/corba/.hgtags	Wed Jul 05 21:35:27 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 21:35:33 2017 +0200
@@ -356,3 +356,4 @@
 2bb92dd44275679edb29fdbffc3b7cbebc9a6bf0 jdk-9+111
 780d0620add32bf545471cf65038c9ac6d9c036d jdk-9+112
 cc30faa2da498c478e89ab062ff160653ca1b170 jdk-9+113
+10d175b0368c30f54350fc648adc41b94ce357ee jdk-9+114
--- a/corba/src/java.corba/share/classes/sun/corba/Bridge.java	Wed Jul 05 21:35:27 2017 +0200
+++ b/corba/src/java.corba/share/classes/sun/corba/Bridge.java	Wed Jul 05 21:35:33 2017 +0200
@@ -37,7 +37,7 @@
 import java.security.PrivilegedAction;
 
 import jdk.internal.misc.Unsafe ;
-import sun.reflect.ReflectionFactory ;
+import jdk.internal.reflect.ReflectionFactory;
 
 /** This class provides the methods for fundamental JVM operations
  * needed in the ORB that are not part of the public Java API.  This includes: