RFR: Cleanup/revert to upstream methodHandles_x86.cpp

[Roman Kennke]

There are some diffs in methodHandles_x86.cpp that are bogus (leftovers)
and we can now revert to upstream. Ok?

Testing: tier3_gc_shenandoah

# HG changeset patch
# User rkennke
# Date 1530626265 -7200
#      Tue Jul 03 15:57:45 2018 +0200
# Node ID 12cc859b13203f59554e3c195915ae531fd6fa78
# Parent  f62138d45312fd1251a0adbb2abd1f0ee78b61f9
Cleanup/revert to upstream methodHandles_x86.cpp

diff --git a/src/hotspot/cpu/x86/methodHandles_x86.cpp
b/src/hotspot/cpu/x86/methodHandles_x86.cpp
--- a/src/hotspot/cpu/x86/methodHandles_x86.cpp
+++ b/src/hotspot/cpu/x86/methodHandles_x86.cpp
@@ -186,11 +186,10 @@
                         Address(temp2,
ConstMethod::size_of_parameters_offset()),
                         sizeof(u2), /*is_signed*/ false);
     // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
-    __ movptr(temp2, __ argument_address(temp2, -1));
     Label L;
-    __ cmpoop(recv, temp2);
+    __ cmpoop(recv, __ argument_address(temp2, -1));
     __ jcc(Assembler::equal, L);
-    __ movptr(rax, temp2);
+    __ movptr(rax, __ argument_address(temp2, -1));
     __ STOP("receiver not on stack");
     __ BIND(L);
   }
@@ -441,6 +440,8 @@
         verify_ref_kind(_masm, JVM_REF_invokeInterface, member_reg, temp3);
       }

+      BarrierSetAssembler* bs =
BarrierSet::barrier_set()->barrier_set_assembler();
+
       Register temp3_intf = temp3;
       __ load_heap_oop(temp3_intf, member_clazz);
       load_klass_from_Class(_masm, temp3_intf);