--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp	Sat Jan 30 11:02:29 2016 -0500
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp	Tue Dec 01 10:35:49 2015 +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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,8 @@
     friend class JVMCIVMStructs;
 
    private:
-    static int InstanceKlass_vtable_start_offset;
-    static int InstanceKlass_vtable_length_offset;
+    static int Klass_vtable_start_offset;
+    static int Klass_vtable_length_offset;
 
     static int Method_extra_stack_entries;