hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Apr 4 20:07:40 UTC 2019


Changeset: 22234bf7809e
Author:    mcimadamore
Date:      2019-04-04 22:07 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/22234bf7809e

Automatic merge with default

! .hgtags
! make/CompileJavaModules.gmk
! src/hotspot/os/bsd/os_bsd.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/code/compiledMethod.hpp
! src/hotspot/share/code/nmethod.hpp
! src/hotspot/share/compiler/compilerOracle.hpp
! src/hotspot/share/gc/epsilon/epsilonHeap.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/shared/barrierSet.hpp
! src/hotspot/share/gc/shared/collectedHeap.cpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
! src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp
! src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp
! src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/oop.hpp
! src/hotspot/share/oops/symbol.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/loopPredicate.cpp
! src/hotspot/share/opto/loopnode.hpp
! src/hotspot/share/opto/loopopts.cpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/runtime/mutexLocker.hpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/sun/security/tools/keytool/Main.java
! src/java.base/share/lib/security/default.policy
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.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/DocFilesHandlerImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java
! test/hotspot/jtreg/ProblemList.txt
- test/hotspot/jtreg/applications/ctw/modules/jdk_incubator_httpclient.java
- test/hotspot/jtreg/applications/ctw/modules/jdk_packager.java
- test/hotspot/jtreg/applications/ctw/modules/jdk_packager_services.java
! test/jdk/ProblemList.txt
- test/jdk/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java
- test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java
- test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p1/C1.java
- test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p2/C2.java
- test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java
- test/langtools/jdk/javadoc/doclet/PackagesHeader/p1/C1.java
- test/langtools/jdk/javadoc/doclet/PackagesHeader/p2/C2.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java
- test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java
- test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java
- test/langtools/jdk/javadoc/doclet/testWindowTitle/p1/C1.java
- test/langtools/jdk/javadoc/doclet/testWindowTitle/p2/C2.java



More information about the amber-dev mailing list