hg: jdk10/master: 2 new changesets

[kumar.x.srinivasan at oracle.com]

Changeset: 2af7932c2f6f
Author:    ksrini
Date:      2017-11-02 13:18 -0700
URL:       http://hg.openjdk.java.net/jdk10/master/rev/2af7932c2f6f

8190287: Update JDK's internal ASM to ASMv6
Reviewed-by: alanb, mchung, sundar

! src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
+ src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt
! test/hotspot/jtreg/runtime/constantPool/ConstModule.java
! test/jdk/java/lang/ModuleTests/AnnotationsTest.java
! test/jdk/java/lang/invoke/DefineClassTest.java
! test/jdk/java/util/ServiceLoader/BadProvidersTest.java
! test/jdk/lib/testlibrary/ModuleTargetHelper.java
! test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java
! test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Main.java

Changeset: 6d0e943bcd24
Author:    alanb
Date:      2017-11-02 13:20 -0700
URL:       http://hg.openjdk.java.net/jdk10/master/rev/6d0e943bcd24

8186236: ModuleInfoExtender should be ASM6 aware
Reviewed-by: ksrini, mchung, sundar

! src/java.base/share/classes/java/lang/Module.java
- src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java
! src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
! src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java