--- old/src/cpu/s390/vm/templateTable_s390.cpp	2017-04-29 08:24:04.957912997 -0700
+++ new/src/cpu/s390/vm/templateTable_s390.cpp	2017-04-29 08:24:04.809907457 -0700
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017 SAP SE. 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
@@ -3708,7 +3708,7 @@
   __ z_sllg(offset, offset, LogBytesPerWord); // Convert to to offset.
   // Get InstanceKlass.
   Register iklass = cpool;
-  __ z_lg(iklass, Address(cpool, offset, sizeof(ConstantPool)));
+  __ load_resolved_klass_at_offset(cpool, offset, iklass);
 
   // Make sure klass is initialized & doesn't have finalizer.
   // Make sure klass is fully initialized.
@@ -3895,7 +3895,7 @@
 
   __ z_lgr(Z_ARG4, Z_tos);  // Save receiver.
   __ z_sllg(index, index, LogBytesPerWord);  // index2bytes for addressing
-  __ mem2reg_opt(klass, Address(cpool, index, sizeof(ConstantPool)));
+  __ load_resolved_klass_at_offset(cpool, index, klass);
 
   __ bind(resolved);
 
@@ -3969,8 +3969,7 @@
 
   __ load_klass(subklass, Z_tos);
   __ z_sllg(index, index, LogBytesPerWord);  // index2bytes for addressing
-  __ mem2reg_opt(klass,
-                 Address(cpool, index, sizeof(ConstantPool)));
+  __ load_resolved_klass_at_offset(cpool, index, klass);
 
   __ bind(resolved);