Merge
authorlana
Thu, 21 Jan 2016 10:17:21 -0800
changeset 35307 50b5ac3cfb59
parent 35239 2c2395ac7604 (diff)
parent 35306 74feccca64cc (current diff)
child 35308 7dbbcead95f6
child 35692 ee66ced7896c
Merge
jdk/src/java.base/share/classes/java/lang/invoke/DontInline.java
jdk/src/java.base/share/classes/java/lang/invoke/ForceInline.java
jdk/src/java.base/share/classes/java/lang/invoke/Stable.java
jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolParser.java
jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java
jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolVisitor.java
jdk/src/java.base/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java
jdk/src/java.base/share/classes/sun/misc/ClassFileTransformer.java
jdk/test/sun/invoke/anon/ConstantPoolPatch/OptimalMapSize.java
--- a/jdk/.hgtags	Thu Jan 21 09:15:31 2016 -0800
+++ b/jdk/.hgtags	Thu Jan 21 10:17:21 2016 -0800
@@ -344,3 +344,4 @@
 e1a789be1535741274c9779f4d4ca3495196b5c3 jdk-9+99
 3d452840f48299a36842760d17c0c8402f0e1266 jdk-9+100
 5e8370fb3ed925335164afe340d1e54beab2d4d5 jdk-9+101
+6eb3c8132e489dab81adde4ce29844904ce15482 jdk-9+102