hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Jan 31 21:09:06 UTC 2019


Changeset: 1920d753c07f
Author:    mcimadamore
Date:      2019-01-31 22:08 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/1920d753c07f

Automatic merge with default

! .hgtags
! make/conf/jib-profiles.js
! src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
! src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
! src/hotspot/cpu/ppc/stubRoutines_ppc.hpp
! src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
! src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/os/linux/os_linux.cpp
! src/hotspot/os/linux/os_linux.hpp
! src/hotspot/share/ci/ciMethodData.cpp
! src/hotspot/share/ci/ciMethodData.hpp
! src/hotspot/share/classfile/symbolTable.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/code/codeHeapState.cpp
! src/hotspot/share/compiler/compileBroker.cpp
! src/hotspot/share/gc/g1/dirtyCardQueue.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/shared/parallelCleaning.hpp
! src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
! src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
! src/hotspot/share/interpreter/invocationCounter.hpp
! src/hotspot/share/memory/virtualspace.hpp
! src/hotspot/share/opto/callnode.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/regmask.cpp
! src/hotspot/share/opto/regmask.hpp
! src/hotspot/share/prims/jni.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/deoptimization.hpp
! src/hotspot/share/runtime/frame.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/java.cpp
! src/hotspot/share/runtime/thread.cpp
! src/hotspot/share/runtime/thread.hpp
! src/hotspot/share/utilities/concurrentHashTable.hpp
! src/hotspot/share/utilities/concurrentHashTable.inline.hpp
! src/java.base/share/classes/java/lang/String.java
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/java.base/share/lib/security/default.policy
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.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/IndexRedirectWriter.java
! test/hotspot/jtreg/ProblemList.txt
- test/hotspot/jtreg/gc/g1/TestStringTableStats.java
! test/jdk/ProblemList.txt
- test/langtools/jdk/javadoc/doclet/testHtmlWarning/TestHtmlWarning.java



More information about the amber-dev mailing list