merge against upstream

[Lupusoru, Razvan A]

Hi Maurizio,

I have started looking at the merge conflicts for the vectorIntrinsics branch - I will send an update once I finish addressing and pushing the changes. Thanks!

--Razvan

-----Original Message-----
From: panama-dev [mailto:panama-dev-bounces at openjdk.java.net] On Behalf Of Maurizio Cimadamore
Sent: Friday, February 02, 2018 10:37 AM
To: 'panama-dev at openjdk.java.net' <panama-dev at openjdk.java.net>
Subject: merge against upstream

Hi,
as we're setting up the machinery to do periodic merges from upstream, we have to do the first (and most painful, since the code has been out of sync for 2 months) merge.

I took care of all branches but two, namely: vectorSnippets and vectorIntrinsics - here are the conflicts:

* vectorSnippets

U src/hotspot/cpu/zero/methodHandles_zero.cpp
U src/hotspot/share/classfile/javaClasses.cpp
U src/hotspot/share/classfile/vmSymbols.hpp
U src/hotspot/share/opto/compile.cpp
U src/hotspot/share/opto/library_call.cpp
U src/hotspot/share/opto/macro.cpp
U src/hotspot/share/runtime/stackValue.hpp

* vectorIntrinsics

U src/hotspot/cpu/x86/assembler_x86.hpp
U src/hotspot/share/adlc/formssel.cpp
U src/hotspot/share/opto/macro.cpp
U src/hotspot/share/prims/unsafe.cpp


Please take a look and merge as appropriate. To merge follow the steps
below:

hg pull

hg update <branch>

hg merge -r default

... resolve conflict ...

hg commit -m 'manual merge with default'

hg push


I'll keep an eye to see when this is done, so that I can take another shot at re-enabling our automerge infra.

Cheers
Maurizio