hg: amber/amber: manual merge with records branch

Wed Oct 16 22:36:26 UTC 2019

Changeset: 24e7f63093ac
Author:    vromero
Date:      2019-10-16 18:36 -0400
URL:       https://hg.openjdk.java.net/amber/amber/rev/24e7f63093ac

manual merge with records branch

! deps.txt
! make/hotspot/symbols/symbols-unix
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classFileParser.hpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/include/jvm.h
! src/hotspot/share/memory/allocation.hpp
! src/hotspot/share/memory/heapInspection.hpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/recordComponent.cpp
! src/hotspot/share/oops/recordComponent.hpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
! src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/java.base/share/classes/java/io/ObjectInputStream.java
! src/java.base/share/classes/java/io/ObjectOutputStream.java
! src/java.base/share/classes/java/io/ObjectStreamClass.java
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/Record.java
! src/java.base/share/classes/java/lang/annotation/ElementType.java
! src/java.base/share/classes/java/lang/reflect/RecordComponent.java
! src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
! src/java.base/share/classes/module-info.java
! src/java.base/share/native/libjava/Class.c
! src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
! src/java.compiler/share/classes/javax/lang/model/element/Element.java
! src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
! src/java.compiler/share/classes/javax/lang/model/element/RecordComponentElement.java
! src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
! src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java
! src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
! src/java.compiler/share/classes/javax/lang/model/util/Elements.java
! src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
! src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
! src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
! src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Accessors.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrContext.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/AccessorTaglet.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/TypeElementCatalog.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java
! src/jdk.jdeps/share/classes/com/sun/tools/classfile/Record_attribute.java
! src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
! src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java
! src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
! test/hotspot/jtreg/runtime/records/recordAttribute.jcod
! test/hotspot/jtreg/runtime/records/recordAttributeTest.java
! test/hotspot/jtreg/runtime/records/recordReflectionTest.java
! test/jdk/java/io/Serializable/records/ProhibitedMethods.java
! test/jdk/java/io/Serializable/records/ReadResolveTest.java
! test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
! test/langtools/jdk/javadoc/doclet/testRecordTypes/examples/Coords.java
! test/langtools/jdk/javadoc/doclet/testRecordTypes/examples/Point.java
! test/langtools/jdk/jshell/CompletenessTest.java
! test/langtools/lib/annotations/annotations/classfile/ClassfileInspector.java
! test/langtools/lib/combo/tools/javac/combo/CompilationTestCase.java
! test/langtools/lib/combo/tools/javac/combo/JavacTemplateTestBase.java
! test/langtools/lib/combo/tools/javac/combo/Template.java
! test/langtools/tools/javac/MethodParameters/AttributeVisitor.java
! test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out
! test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out
! test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out
! test/langtools/tools/javac/diags/examples.not-yet.txt
! test/langtools/tools/javac/doctree/AccessorsTest.java
! test/langtools/tools/javac/doctree/DocCommentTester.java
! test/langtools/tools/javac/enum/EnumMembersOrder.out
! test/langtools/tools/javac/lib/DPrinter.java
! test/langtools/tools/javac/parser/JavacParserTest.java
! test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out
! test/langtools/tools/javac/parser/extend/TrialParser.java
! test/langtools/tools/javac/processing/model/TestSourceVersion.java
! test/langtools/tools/javac/processing/model/element/TestRecord.java
! test/langtools/tools/javac/processing/model/element/TestRecordDesugar.java
! test/langtools/tools/javac/records/BadRecord.java
! test/langtools/tools/javac/records/BadRecord.out
! test/langtools/tools/javac/records/OriginTest.java
! test/langtools/tools/javac/records/RecordCompilationTests.java
! test/langtools/tools/javac/records/RecordMemberTests.java
! test/langtools/tools/javac/records/RecordReflectionTest.java
! test/langtools/tools/javac/records/VarargsRecordsTest.java
! test/langtools/tools/javac/records/annotations/AnnoProcessorOnRecordsTest.java
! test/langtools/tools/javac/records/annotations/CheckingTypeAnnotationsOnRecords.java
! test/langtools/tools/javac/records/annotations/JavaxLangModelForRecords.java
! test/langtools/tools/javac/records/mandated_members/CheckRecordMembers.java
! test/langtools/tools/javac/records/writeread/Record.java
! test/langtools/tools/javac/records/writeread/WriteReadTest.java