1 files changed, 5 insertions, 10 deletions
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 839480b..11f6c94 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1905,18 +1905,13 @@ build_invokevirtual (tree dtable, tree method)
     }
   else
     {
-      method_index = convert (sizetype, DECL_VINDEX (method));
-
-      if (TARGET_VTABLE_USES_DESCRIPTORS)
-	/* Add one to skip bogus descriptor for class and GC descriptor. */
-	method_index = size_binop (PLUS_EXPR, method_index, size_int (1));
-      else
-	/* Add 1 to skip "class" field of dtable, and 1 to skip GC descriptor.  */
-	method_index = size_binop (PLUS_EXPR, method_index, size_int (2));
-
+      /* We fetch the DECL_VINDEX field directly here, rather than
+	 using get_method_index().  DECL_VINDEX is the true offset
+	 from the vtable base to a method, regrdless of any extra
+	 words inserted at the start of the vtable.  */
+      method_index = DECL_VINDEX (method);
       method_index = size_binop (MULT_EXPR, method_index,
 				 TYPE_SIZE_UNIT (nativecode_ptr_ptr_type_node));
-
       if (TARGET_VTABLE_USES_DESCRIPTORS)
 	method_index = size_binop (MULT_EXPR, method_index,
 				   size_int (TARGET_VTABLE_USES_DESCRIPTORS));