hg: panama/dev: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: fc838b7d2c3f
Author:    mcimadamore
Date:      2018-09-26 22:09 +0200
URL:       http://hg.openjdk.java.net/panama/dev/rev/fc838b7d2c3f

Automatic merge with default

! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/arm/methodHandles_arm.cpp
! src/hotspot/cpu/arm/sharedRuntime_arm.cpp
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/cpu/x86/x86_64.ad
- src/hotspot/share/classfile/compactHashtable.inline.hpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/macro.cpp
! src/hotspot/share/runtime/globals.hpp
- src/java.base/macosx/native/libjli/java_md_macosx.c
- test/jdk/com/sun/jdi/RedefineException.sh
- test/jdk/com/sun/jdi/RedefineFinal.sh
- test/jdk/com/sun/jdi/RedefineIntConstantToLong.sh
- test/jdk/com/sun/jdi/RedefineMulti.sh
- test/jdk/com/sun/jdi/RedefinePop.sh
- test/jdk/com/sun/jdi/RedefineStep.sh
- test/jdk/com/sun/jdi/RedefineTTYLineNumber.sh
- test/jdk/com/sun/jdi/StringConvertTest.sh
- test/jdk/com/sun/jdi/WatchFramePop.sh
- test/jdk/lib/testlibrary/jdk/testlibrary/Asserts.java