--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp	Mon Apr 30 09:49:08 2018 -0700
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp	Mon Apr 30 21:17:37 2018 +0200
@@ -110,7 +110,8 @@
   }
 }
 
-void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Register robj, Register tmp, Label& slowpath) {
-  __ clear_jweak_tag(robj);
-  __ movptr(robj, Address(robj, 0));
+void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
+                                                        Register obj, Register tmp, Label& slowpath) {
+  __ clear_jweak_tag(obj);
+  __ movptr(obj, Address(obj, 0));
 }