--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Thu Jan 28 07:11:45 2016 +0100
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Wed Jan 27 14:50:56 2016 +0100
@@ -151,8 +151,8 @@
 int CompilerToVM::Data::cardtable_shift;
 
 void CompilerToVM::Data::initialize() {
-  InstanceKlass_vtable_start_offset = InstanceKlass::vtable_start_offset();
-  InstanceKlass_vtable_length_offset = InstanceKlass::vtable_length_offset() * HeapWordSize;
+  InstanceKlass_vtable_start_offset = in_bytes(InstanceKlass::vtable_start_offset());
+  InstanceKlass_vtable_length_offset = in_bytes(InstanceKlass::vtable_length_offset());
 
   Method_extra_stack_entries = Method::extra_stack_entries();