[multiple changes]

2004-04-14  Andrew Haley  <aph@redhat.com>
            Bryce McKinlay  <mckinlay@redhat.com>

	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Use
	_Jv_LookupInterfaceMethodIdx for calls to interfaces.
	* include/jvm.h (_Jv_CallAnyMethodA): Add new 	face' arg.

	* testsuite/libjava.lang/InvokeInterface.java: New file.
	* testsuite/libjava.lang/InvokeInterface.out: New file.

2004-04-14  Bryce McKinlay  <mckinlay@redhat.com>

	* class.c (get_interface_method_index): New function. Return
	dispatch index for interface method.
	(make_method_value): For interface methods, set index field to
	iface dispatch index, not DECL_VINDEX.
	* expr.c (build_invokeinterface): Use get_interface_method_index.

From-SVN: r80684

6 files changed, 92 insertions, 11 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 787119b..297bd70 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-14  Andrew Haley  <aph@redhat.com>
+            Bryce McKinlay  <mckinlay@redhat.com>
+
+	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Use
+	_Jv_LookupInterfaceMethodIdx for calls to interfaces.
+	* include/jvm.h (_Jv_CallAnyMethodA): Add new `iface' arg.
+
+	* testsuite/libjava.lang/InvokeInterface.java: New file.
+	* testsuite/libjava.lang/InvokeInterface.out: New file.
+
 2004-04-09  Ranjit Mathew  <rmathew@hotmail.com>
 	
 	* java/lang/VMThrowable.java (getStackTrace): Pass trace as-is to
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index ee7792b..398f854 100644
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -422,7 +422,8 @@ extern jboolean _Jv_CheckAccess (jclass self_klass, jclass other_klass,
 extern jobject _Jv_CallAnyMethodA (jobject obj, jclass return_type,
 				   jmethodID meth, jboolean is_constructor,
 				   JArray<jclass> *parameter_types,
-				   jobjectArray args);
+				   jobjectArray args,
+				   jclass iface = NULL);
 
 union jvalue;
 extern void _Jv_CallAnyMethodA (jobject obj,
@@ -433,7 +434,8 @@ extern void _Jv_CallAnyMethodA (jobject obj,
 				JArray<jclass> *parameter_types,
 				jvalue *args,
 				jvalue *result,
-				jboolean is_jni_call = true);
+				jboolean is_jni_call = true,
+				jclass iface = NULL);
 
 extern jobject _Jv_NewMultiArray (jclass, jint ndims, jint* dims)
   __attribute__((__malloc__));
diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index 736103b..96d293b 100644
--- a/libjava/java/lang/reflect/natMethod.cc
+++ b/libjava/java/lang/reflect/natMethod.cc
@@ -143,14 +143,14 @@ jobject
 java::lang::reflect::Method::invoke (jobject obj, jobjectArray args)
 {
   using namespace java::lang::reflect;
+  jclass iface = NULL;
   
   if (parameter_types == NULL)
     getType ();
     
   jmethodID meth = _Jv_FromReflectedMethod (this);
-
   jclass objClass;
-  
+
   if (Modifier::isStatic(meth->accflags))
     {
       // We have to initialize a static class.  It is safe to do this
@@ -188,8 +188,11 @@ java::lang::reflect::Method::invoke (jobject obj, jobjectArray args)
 	throw new IllegalAccessException;
     }
 
+  if (declaringClass->isInterface())
+    iface = declaringClass;
+  
   return _Jv_CallAnyMethodA (obj, return_type, meth, false,
-			     parameter_types, args);
+			     parameter_types, args, iface);
 }
 
 jint
@@ -341,7 +344,8 @@ _Jv_CallAnyMethodA (jobject obj,
 		    JArray<jclass> *parameter_types,
 		    jvalue *args,
 		    jvalue *result,
-		    jboolean is_jni_call)
+		    jboolean is_jni_call,
+		    jclass iface)
 {
   using namespace java::lang::reflect;
   
@@ -478,7 +482,10 @@ _Jv_CallAnyMethodA (jobject obj,
       && (_Jv_ushort)-1 != meth->index)
     {
       _Jv_VTable *vtable = *(_Jv_VTable **) obj;
-      ncode = vtable->get_method (meth->index);
+      if (iface == NULL)
+	ncode = vtable->get_method (meth->index);
+      else
+	ncode = _Jv_LookupInterfaceMethodIdx (vtable->clas, iface, meth->index);
     }
   else
     {
@@ -553,7 +560,8 @@ _Jv_CallAnyMethodA (jobject obj,
 		    jmethodID meth,
 		    jboolean is_constructor,
 		    JArray<jclass> *parameter_types,
-		    jobjectArray args)
+		    jobjectArray args,
+		    jclass iface)
 {
   if (parameter_types->length == 0 && args == NULL)
     {
@@ -621,7 +629,7 @@ _Jv_CallAnyMethodA (jobject obj,
   _Jv_CallAnyMethodA (obj, return_type, meth, is_constructor,
   		      _Jv_isVirtualMethod (meth),
 		      parameter_types, argvals, &ret_value,
-		      false);
+		      false, iface);
 
   jobject r;
 #define VAL(Wrapper, Field)  (new Wrapper (ret_value.Field))
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index 129d25c..21c86dd 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/libjava/testsuite/libjava.lang/InvokeInterface.java b/libjava/testsuite/libjava.lang/InvokeInterface.java
new file mode 100644
index 0000000..6f4dc61
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/InvokeInterface.java
@@ -0,0 +1,55 @@
+import java.lang.reflect.*;
+
+interface one
+{
+  int n(int N);
+}
+
+interface two
+{
+  int nn(int N);
+}
+
+interface three
+{
+  int nnn(int N);
+}
+
+class arse implements one, two
+{
+  public int n(int N) { return N; }
+  public int nn(int N) { return N*2; }
+}
+
+class arsey implements two, one, three
+{
+  public int n(int N) { return N*4; }
+  public int nn(int N) { return N*8; }
+  public int nnn(int N) { return N*16; }
+}
+
+public class InvokeInterface extends arse
+{
+  int f ()
+  {
+	return flunk.nn(1);
+  }
+  static two flunk = new arse();
+  static three flunkey = new arsey();
+  public static void main(String[] s) throws Throwable
+  {
+	Class[] argtypes = {Integer.TYPE};
+	Method m = two.class.getMethod("nn", argtypes);
+	Object[] args = {new Integer(1)};
+	System.out.println(flunk.nn(1));
+	System.out.println(m.invoke(new arse(), args));
+	m = arse.class.getMethod("nn", argtypes);
+	System.out.println(m.invoke(new arse(), args));
+	m = two.class.getMethod("nn", argtypes);
+	System.out.println(m.invoke(new arsey(), args));
+	m = three.class.getMethod("nnn", argtypes);
+	System.out.println(m.invoke(new arsey(), args));	
+	m = arsey.class.getMethod("nnn", argtypes);
+	System.out.println(m.invoke(new arsey(), args));	
+  }
+}
diff --git a/libjava/testsuite/libjava.lang/InvokeInterface.out b/libjava/testsuite/libjava.lang/InvokeInterface.out
new file mode 100644
index 0000000..803d026
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/InvokeInterface.out
@@ -0,0 +1,6 @@
+2
+2
+2
+8
+16
+16