hg: panama/dev: Manual merge with default

[Vladimir Ivanov]

Hi,

While doing a merge of vectorIntrinsics with default, I had to resolve 
some conflicts in aarch64-specific code, but couldn't test the changes.

Please, verify it still works.

Best regards,
Vladimir Ivanov

On 22/03/2019 16:29, vladimir.x.ivanov at oracle.com wrote:
> Changeset: 39a4aa9406e8
> Author:    vlivanov
> Date:      2019-03-22 16:29 -0700
> URL:       http://hg.openjdk.java.net/panama/dev/rev/39a4aa9406e8
> 
> Manual merge with default
> 
> ! make/common/NativeCompilation.gmk
> ! src/hotspot/cpu/aarch64/aarch64.ad
> ! src/hotspot/cpu/aarch64/assembler_aarch64.hpp
> ! src/hotspot/cpu/x86/assembler_x86.cpp
> ! src/hotspot/cpu/x86/assembler_x86.hpp
> ! src/hotspot/cpu/x86/macroAssembler_x86.hpp
> ! src/hotspot/cpu/x86/x86.ad
> ! src/hotspot/cpu/x86/x86_64.ad
> ! src/hotspot/share/adlc/formssel.cpp
> - src/hotspot/share/gc/z/zAddressRangeMap.hpp
> - src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp
> ! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
> ! src/hotspot/share/opto/classes.hpp
> ! src/hotspot/share/opto/compile.cpp
> ! src/hotspot/share/opto/library_call.cpp
> ! src/hotspot/share/opto/matcher.cpp
> ! src/hotspot/share/opto/memnode.cpp
> ! src/hotspot/share/opto/vectornode.cpp
> ! src/hotspot/share/opto/vectornode.hpp
> ! src/hotspot/share/runtime/globals.hpp
> ! src/hotspot/share/runtime/vmStructs.cpp
> - src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMaths.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/IntegerExactOpSpeculation.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java
> - src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java
> - src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java
> - test/langtools/jdk/javadoc/tool/removeOldDoclet/OldDoclet.jasm
>