Merge
authorlana
Thu, 28 May 2015 16:54:56 -0700
changeset 30848 c275389a3680
parent 30842 b02fa8bb730c (diff)
parent 30847 9385b9c8506b (current diff)
child 30849 fcfa8eb95c23
Merge
langtools/make/gensrc/Gensrc-jdk.dev.gmk
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AccessFlags.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Annotation.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/AttributeException.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Attributes.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassFile.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassReader.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassTranslator.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ClassWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Code_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantPool.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantPoolException.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/DefaultAttribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Dependencies.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Dependency.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Descriptor.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/DescriptorException.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Field.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Instruction.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Method.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Opcode.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/ReferenceFinder.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Signature.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Signature_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/SourceID_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/StackMap_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/Type.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/TypeAnnotation.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile/package-info.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/AnnotationWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/AttributeWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/BasicWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/ClassWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/CodeWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/ConstantWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Context.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/DisassemblerTool.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/InternalError.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/JavapFileManager.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/JavapTask.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Main.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Messages.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/Options.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/SourceWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/StackMapWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/TryBlockWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/overview.html
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/package-info.java
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap.properties
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap_ja.properties
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
langtools/src/jdk.compiler/share/classes/com/sun/tools/javap/resources/version.properties-template
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Analyzer.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Archive.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/ClassFileReader.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/JdepsTask.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Main.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Module.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/Profile.java
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps.properties
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources/version.properties-template
--- a/langtools/.hgtags	Thu May 28 12:08:54 2015 -0700
+++ b/langtools/.hgtags	Thu May 28 16:54:56 2015 -0700
@@ -308,3 +308,4 @@
 a28b7f42dae9bd59513beaa5a2d6eb563dc09e08 jdk9-b63
 809d66512998789b620d08c335d7c31211a0cf29 jdk9-b64
 4fcf722b811406a7db8f206d88446c82cda1b5f4 jdk9-b65
+fd6bda430d96fc5ab421161de016412f2ddd9082 jdk9-b66