X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fpeers%2Fgov%2Fnasa%2Fjpf%2Fvm%2FJPF_java_lang_Class.java;h=2c769f243638a7d279a564598de37d599097e651;hb=e6b512b8180176104b22dfbd2eb23aefab7b49d6;hp=cdc5dd709359a91bf10779a84a2ec15e84d7343b;hpb=9530ffc869c8b7768131e093593200126918ee28;p=jpf-core.git

diff --git a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_Class.java b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_Class.java
index cdc5dd7..2c769f2 100644
--- a/src/peers/gov/nasa/jpf/vm/JPF_java_lang_Class.java
+++ b/src/peers/gov/nasa/jpf/vm/JPF_java_lang_Class.java
@@ -108,8 +108,8 @@ public class JPF_java_lang_Class extends NativePeer {
   }
 
   // TODO: Fix for Groovy's model-checking
-  private static int getParameterizedTypeImplObj(String className, String[] parameterizedTypes, String ownerType,
-                                                 MJIEnv env, int objRef, int superObjRef) {
+  private static int getParameterizedTypeImplObj(String[] parameterizedTypes, String ownerType,
+                                                 MJIEnv env, int actObjRef, int rawObjRef) {
 
     ThreadInfo ti = env.getThreadInfo();
     ClassLoaderInfo cli = env.getSystemClassLoaderInfo();
@@ -119,12 +119,12 @@ public class JPF_java_lang_Class extends NativePeer {
     ElementInfo ei = env.getModifiableElementInfo(paramTypeRef);
     // Get field information and fill out the fields
     // rawType field
-    ei.setReferenceField("rawType", superObjRef);
+    ei.setReferenceField("rawType", rawObjRef);
 
     // actualTypeArguments
     int[] types = new int[parameterizedTypes.length];
     for(int j = 0; j < parameterizedTypes.length; j++) {
-        types[j] = getTypeVariableImplObject(env, objRef, parameterizedTypes[j]);
+        types[j] = getTypeVariableImplObject(env, actObjRef, parameterizedTypes[j]);
     }
     int aRef = env.newObjectArray("Ljava/lang/reflect/Type;", parameterizedTypes.length);
     // Set references for every array element
@@ -173,8 +173,7 @@ public class JPF_java_lang_Class extends NativePeer {
       }
       String className = sci.getName();
       String ownerType = Types.getOwnerClassName(className);
-      int gRef = getParameterizedTypeImplObj(className, typeVars, ownerType, env, ci.getClassObjectRef(),
-              sci.getClassObjectRef());
+      int gRef = getParameterizedTypeImplObj(typeVars, ownerType, env, ci.getClassObjectRef(), sci.getClassObjectRef());
 
       return gRef;
     } else {
@@ -184,20 +183,28 @@ public class JPF_java_lang_Class extends NativePeer {
 
   @MJI
   public int getGenericInterfaces_____3Ljava_lang_reflect_Type_2 (MJIEnv env, int robj) {
-    // TODO: Need to add ParameterizedTypeImpl
     ClassInfo ci = env.getReferredClassInfo(robj);
     int aref = MJIEnv.NULL;
     ThreadInfo ti = env.getThreadInfo();
-
     // contrary to the API doc, this only returns the interfaces directly
     // implemented by this class, not it's bases
     // <2do> this is not exactly correct, since the interfaces should be ordered
     Set<ClassInfo> interfaces = ci.getInterfaceClassInfos();
+
     aref = env.newObjectArray("Ljava/lang/Class;", interfaces.size());
 
     int i=0;
     for (ClassInfo ifc: interfaces){
-      env.setReferenceArrayElement(aref, i++, ifc.getClassObjectRef());
+      if (Types.isGenericSignature(ifc.getGenericSignature())) {
+        String className = ifc.getName();
+        String ownerType = Types.getOwnerClassName(className);
+        String[] typeVars = ifc.getGenericTypeVariableNames();
+        int paramTypeObj = getParameterizedTypeImplObj(typeVars, ownerType, env, ci.getClassObjectRef(),
+                ifc.getClassObjectRef());
+        env.setReferenceArrayElement(aref, i++, paramTypeObj);
+      } else {
+        env.setReferenceArrayElement(aref, i++, ifc.getClassObjectRef());
+      }
     }
 
     return aref;