hg: panama/dev: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Feb 28 21:12:58 UTC 2018


Changeset: 6be9548e3fc3
Author:    mcimadamore
Date:      2018-02-28 22:09 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/6be9548e3fc3

Automatic merge with default

! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/logging/logTag.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/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/output.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/sharedRuntime.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/hotspot/share/services/allocationContextService.hpp
! src/hotspot/share/utilities/debug.cpp
! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
- 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