--- a/hotspot/src/cpu/ppc/vm/ppc.ad Thu Jan 28 07:11:45 2016 +0100
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad Wed Jan 27 14:50:56 2016 +0100
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
// Copyright 2012, 2015 SAP AG. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
@@ -3562,8 +3562,8 @@
__ load_klass(R11_scratch1, R3);
- int entry_offset = InstanceKlass::vtable_start_offset() + _vtable_index * vtableEntry::size();
- int v_off = entry_offset * wordSize + vtableEntry::method_offset_in_bytes();
+ int entry_offset = in_bytes(InstanceKlass::vtable_start_offset()) + _vtable_index * vtableEntry::size_in_bytes();
+ int v_off = entry_offset + vtableEntry::method_offset_in_bytes();
__ li(R19_method, v_off);
__ ldx(R19_method/*method oop*/, R19_method/*method offset*/, R11_scratch1/*class*/);
// NOTE: for vtable dispatches, the vtable entry will never be