--- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp	Sat Jan 26 12:51:27 2019 -0800
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp	Mon Jan 28 08:58:42 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,11 @@
 
 class ZLoadBarrierStubC1 : public CodeStub {
 private:
-  DecoratorSet  _decorators;
-  LIR_Opr       _ref_addr;
-  LIR_Opr       _ref;
-  LIR_Opr       _tmp;
-  CodeEmitInfo* _patch_info;
-  address       _runtime_stub;
+  DecoratorSet _decorators;
+  LIR_Opr      _ref_addr;
+  LIR_Opr      _ref;
+  LIR_Opr      _tmp;
+  address      _runtime_stub;
 
 public:
   ZLoadBarrierStubC1(LIRAccess& access, LIR_Opr ref, address runtime_stub);
@@ -46,8 +45,6 @@
   LIR_Opr ref() const;
   LIR_Opr ref_addr() const;
   LIR_Opr tmp() const;
-  LIR_PatchCode patch_code() const;
-  CodeEmitInfo*& patch_info();
   address runtime_stub() const;
 
   virtual void emit_code(LIR_Assembler* ce);
@@ -67,6 +64,7 @@
   void load_barrier(LIRAccess& access, LIR_Opr result) const;
 
 protected:
+  virtual LIR_Opr resolve_address(LIRAccess& access, bool resolve_in_register);
   virtual void load_at_resolved(LIRAccess& access, LIR_Opr result);
   virtual LIR_Opr atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value);
   virtual LIR_Opr atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value);