--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Thu Jan 28 07:11:45 2016 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Wed Jan 27 14:50:56 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -2972,8 +2972,8 @@
SharedRuntime::get_resolve_virtual_call_stub(),
arg_list, info);
} else {
- int entry_offset = InstanceKlass::vtable_start_offset() + x->vtable_index() * vtableEntry::size();
- int vtable_offset = entry_offset * wordSize + vtableEntry::method_offset_in_bytes();
+ int entry_offset = in_bytes(InstanceKlass::vtable_start_offset()) + x->vtable_index() * vtableEntry::size_in_bytes();
+ int vtable_offset = entry_offset + vtableEntry::method_offset_in_bytes();
__ call_virtual(target, receiver, result_register, vtable_offset, arg_list, info);
}
break;