A proper implementation for getGenericParameterTypes using the class ParameterizedTyp...

[jpf-core.git] / src / peers / gov / nasa / jpf / vm / JPF_java_lang_reflect_Method.java

diff --git a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_reflect_Method.java b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_reflect_Method.java
index 4e1987be755d85a5e84ad57f9fc61565f99e39af..efb46e8ec1fdf8415ac5a48e4c01f5cb563095da 100644 (file)
--- a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_reflect_Method.java
+++ b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_reflect_Method.java
@@ -115,27 +115,72 @@ public class JPF_java_lang_reflect_Method extends NativePeer {
   }
 
   // TODO: Fix for Groovy's model-checking
-  // TODO: We have been able to only register the generic class and not yet the parameterized types
-  static int getGenericParameterTypes( MJIEnv env, MethodInfo mi) {
+  private static int getParameterizedTypeImplObj(String signature, MJIEnv env) {
+
+    ThreadInfo ti = env.getThreadInfo();
+    ClassLoaderInfo cli = env.getSystemClassLoaderInfo();
+    ClassInfo ci = cli.getResolvedClassInfo("sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl");
+    // Create a new object of type ParameterizedTypeImpl
+    int paramTypeRef = env.newObject(ci);
+    ElementInfo ei = env.getModifiableElementInfo(paramTypeRef);
+    // Get field information and fill out the fields
+    // rawType field
+    String className = Types.getGenericClassName(signature);
+    ClassInfo gci = cli.getResolvedClassInfo(className);
+    if (!gci.isRegistered()) {
+        gci.registerClass(ti);
+    }
+    ei.setReferenceField("rawType", gci.getClassObjectRef());
+
+    // actualTypeArguments
+    String[] parameterizedTypes = Types.getParameterizedTypesFromArgumentTypeNames(signature);
+    int[] types = new int[parameterizedTypes.length];
+    for(int j = 0; j < parameterizedTypes.length; j++) {
+      ClassInfo pci = cli.getResolvedClassInfo(parameterizedTypes[j]);
+      if (!pci.isRegistered()) {
+        pci.registerClass(ti);
+      }
+      types[j] = pci.getClassObjectRef();
+    }
+    int aRef = env.newObjectArray("Ljava/lang/reflect/Type;", parameterizedTypes.length);
+    // Set references for every array element
+    for (int j = 0; j < parameterizedTypes.length; j++) {
+      env.setReferenceArrayElement(aRef, j, types[j]);
+    }
+    ei.setReferenceField("actualTypeArguments", aRef);
+
+    // ownerType
+    String ownerType = Types.getOwnerClassName(signature);
+    if (ownerType != null) {
+      ClassInfo oci = ClassLoaderInfo.getCurrentResolvedClassInfo(ownerType);
+      if (!oci.isRegistered()) {
+        oci.registerClass(ti);
+      }
+      ei.setReferenceField("ownerType", oci.getClassObjectRef());
+    } else {
+      ei.setReferenceField("ownerType", MJIEnv.NULL);
+    }
+
+    return paramTypeRef;
+  }
+
+  static int getGenericParameterTypes( MJIEnv env, int objRef, MethodInfo mi) {
     ThreadInfo ti = env.getThreadInfo();
     String[] argTypeNames = mi.getArgumentGenericTypeNames();
     int[] ar = new int[argTypeNames.length];
 
     for (int i = 0; i < argTypeNames.length; i++) {
       // Change this into just the generic class type if it is a generic class
-      String genericTypeName = argTypeNames[i];
-      int startOfGenericParameter = argTypeNames[i].indexOf('<');
-      if (startOfGenericParameter != -1) {
-        genericTypeName = argTypeNames[i].substring(0, startOfGenericParameter);
-      }
-      ClassInfo ci = ClassLoaderInfo.getCurrentResolvedClassInfo(genericTypeName);
-      if (!ci.isRegistered()) {
-        ci.registerClass(ti);
+      if (Types.isGenericSignature(argTypeNames[i])) {
+        ar[i] = getParameterizedTypeImplObj(argTypeNames[i], env);
+      } else {
+        ClassInfo ci = ClassLoaderInfo.getCurrentResolvedClassInfo(argTypeNames[i]);
+        if (!ci.isRegistered()) {
+          ci.registerClass(ti);
+        }
+        ar[i] = ci.getClassObjectRef();
       }
-
-      ar[i] = ci.getClassObjectRef();
     }
-
     int aRef = env.newObjectArray("Ljava/lang/reflect/Type;", argTypeNames.length);
     for (int i = 0; i < argTypeNames.length; i++) {
       env.setReferenceArrayElement(aRef, i, ar[i]);
@@ -146,7 +191,7 @@ public class JPF_java_lang_reflect_Method extends NativePeer {
 
   @MJI
   public int getGenericParameterTypes_____3Ljava_lang_reflect_Type_2 (MJIEnv env, int objRef){
-    return getGenericParameterTypes(env, getMethodInfo(env, objRef));
+    return getGenericParameterTypes(env, objRef, getMethodInfo(env, objRef));
   }
 
   @MJI