src/cpu/s390/vm/templateTable_s390.cpp

@@ -1,8 +1,8 @@
 /*
- * 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -3706,11 +3706,11 @@
   __ z_brne(slow_case);
 
   __ 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.
   const int state_offset = in_bytes(InstanceKlass::init_state_offset());
   if (Immediate::is_uimm12(state_offset)) {

@@ -3893,11 +3893,11 @@
   // Get superklass in klass and subklass in subklass.
   __ bind(quicked);
 
   __ 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);
 
   __ load_klass(subklass, receiver);
 

@@ -3967,12 +3967,11 @@
   // Get superklass in klass and subklass in subklass.
   __ bind(quicked);
 
   __ 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);
 
   // Generate subtype check.
   // Superklass in klass. Subklass in subklass.