hg: panama/dev: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Wed Feb 28 21:13:16 UTC 2018
Changeset: a8c43e04765c
Author: mcimadamore
Date: 2018-02-28 22:09 +0100
URL: http://hg.openjdk.java.net/panama/dev/rev/a8c43e04765c
Automatic merge with default
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/logging/logTagLevelExpression.cpp
- src/hotspot/share/logging/logTagLevelExpression.hpp
! src/hotspot/share/opto/callnode.cpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/output.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/hotspot/share/services/allocationContextService.hpp
! src/hotspot/share/utilities/globalDefinitions.hpp
- src/java.base/unix/classes/java/io/FileDescriptor.java
- src/java.base/windows/classes/java/io/FileDescriptor.java
- test/hotspot/gtest/logging/test_logTagLevelExpression.cpp
- test/jdk/com/sun/jdi/JDIScaffold.java
- test/jdk/java/lang/System/ExitFinalizersAndJIT.java
- test/jdk/java/lang/System/finalization/FinExit.java
- test/jdk/java/lang/System/finalization/FinExit.sh
More information about the panama-dev
mailing list